Yadciel/c_tray
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1)deleted old struct; 2) formated code

Browse Source
This commit is contained in:
angelskieglazki
2017-01-12 11:02:46 +03:00
parent 22f65a80a9
commit a66de7c433
2 changed files with 54 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
tray.h
View File

@@ -52,27 +52,26 @@ static int tray_loop(int blocking) {
return loop_result;
}
//recursive proc
static void submenu_update(struct tray_menu *m,
GtkWidget *_item, GtkMenuShell *_submenu) {
GtkMenuShell *submenu;
for (struct tray_menu *s_m = m->submenu; s_m!=NULL && s_m->text!=NULL; s_m++) {
// recursive proc
static void submenu_update(struct tray_menu *m, GtkWidget *_item,
GtkMenuShell *_submenu) {
GtkMenuShell *submenu;
for (struct tray_menu *s_m = m->submenu; s_m != NULL && s_m->text != NULL;
s_m++) {
GtkWidget *item;
if (s_m->submenu != NULL) {
item = gtk_menu_item_new_with_label(s_m->text);
submenu = (GtkMenuShell *)gtk_menu_new();
gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), (GtkWidget *)submenu);
submenu_update(s_m, item, submenu);
gtk_widget_show(item);
gtk_menu_shell_append(GTK_MENU_SHELL(_submenu), item);
}else if (strcmp(s_m->text, "-") == 0) {
if (s_m->submenu != NULL) {
item = gtk_menu_item_new_with_label(s_m->text);
submenu = (GtkMenuShell *)gtk_menu_new();
gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), (GtkWidget *)submenu);
submenu_update(s_m, item, submenu);
gtk_widget_show(item);
gtk_menu_shell_append(GTK_MENU_SHELL(_submenu), item);
} else if (strcmp(s_m->text, "-") == 0) {
gtk_menu_item_set_submenu(GTK_MENU_ITEM(_item), (GtkWidget *)_submenu);
item = gtk_separator_menu_item_new();
gtk_widget_show(item);
gtk_menu_shell_append(GTK_MENU_SHELL(_submenu), item);
}
else{
} else {
gtk_menu_item_set_submenu(GTK_MENU_ITEM(_item), (GtkWidget *)_submenu);
item = gtk_check_menu_item_new_with_label(s_m->text);
gtk_widget_set_sensitive(item, !s_m->disabled);
@@ -83,27 +82,27 @@ static void submenu_update(struct tray_menu *m,
g_signal_connect(item, "activate", G_CALLBACK(_tray_menu_cb), s_m);
}
}
}
}
}
static void tray_update(struct tray *tray) {
GtkMenuShell *menu = (GtkMenuShell *)gtk_menu_new();
for (struct tray_menu *m = tray->menu; m != NULL && m->text != NULL; m++) {
GtkWidget *item;
if (m->submenu != NULL) {
if (m->submenu != NULL) {
GtkMenuShell *submenu = (GtkMenuShell *)gtk_menu_new();
item = gtk_menu_item_new_with_label(m->text);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), (GtkWidget *)submenu);
submenu_update(m, item, submenu);
} else if (strcmp(m->text, "-") == 0) {
item = gtk_separator_menu_item_new();
} else {
} else {
item = gtk_check_menu_item_new_with_label(m->text);
gtk_widget_set_sensitive(item, !m->disabled);
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), !!m->checked);
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), !!m->checked);
}
gtk_widget_show(item);
gtk_widget_show(item);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
if (m->cb != NULL) {
g_signal_connect(item, "activate", G_CALLBACK(_tray_menu_cb), m);
@@ -115,7 +114,6 @@ static void tray_update(struct tray *tray) {
app_indicator_set_menu(indicator, GTK_MENU(menu));
}
static void tray_exit() { loop_result = -1; }
#elif defined(TRAY_APPKIT)
@@ -212,8 +210,8 @@ static NOTIFYICONDATA nid;
static HWND hwnd;
static HMENU hmenu = NULL;
static LRESULT CALLBACK _tray_wnd_proc(HWND hwnd, UINT msg, WPARAM wparam,
LPARAM lparam) {
static LRESULT CALLBACK
_tray_wnd_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
switch (msg) {
case WM_CLOSE:
DestroyWindow(hwnd);
@@ -351,4 +349,4 @@ static void tray_update(struct tray *tray) {}
static void tray_exit();
#endif
#endif /* TRAY_H */
#endif /* TRAY_H */