diff options
| author | Étienne Deparis <[email protected]> | 2019-04-03 20:10:30 +0200 |
|---|---|---|
| committer | Martin Wimpress <[email protected]> | 2019-09-23 19:47:35 +0100 |
| commit | f7d91bec9db5e02721f28997a71b05c4bbbe2315 (patch) | |
| tree | e6dda71d29e0185e24c96a8f1d913a8dbdf37dc0 | |
| parent | ccc094e5fe4c7bf49fa2f3aa43d63f8c51d76eb8 (diff) | |
| download | mate-netbook-f7d91bec9db5e02721f28997a71b05c4bbbe2315.tar.bz2 mate-netbook-f7d91bec9db5e02721f28997a71b05c4bbbe2315.tar.xz | |
Refactor the on_active_window_changed function
| -rw-r--r-- | mate-window-picker-applet/task-title.c | 45 |
1 files changed, 11 insertions, 34 deletions
diff --git a/mate-window-picker-applet/task-title.c b/mate-window-picker-applet/task-title.c index 6170c4c..f8e3142 100644 --- a/mate-window-picker-applet/task-title.c +++ b/mate-window-picker-applet/task-title.c @@ -25,8 +25,6 @@ #include <math.h> -#include "task-list.h" - G_DEFINE_TYPE (TaskTitle, task_title, GTK_TYPE_EVENT_BOX); #define TASK_TITLE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj),\ @@ -257,17 +255,20 @@ on_active_window_changed (WnckScreen *screen, gtk_label_set_text (GTK_LABEL (priv->label), _("Home")); gtk_image_set_from_pixbuf (GTK_IMAGE (priv->button_image), priv->quit_icon); + + gtk_widget_set_tooltip_text (GTK_WIDGET (title), NULL); gtk_widget_set_tooltip_text (priv->button, - _("Log off, switch user, lock screen or power " - "down the computer")); - gtk_widget_set_tooltip_text (GTK_WIDGET (title), - _("Home")); gtk_widget_show (priv->box); + _("Log off, switch user, lock screen or " + "power down the computer")); + + gtk_widget_set_state (GTK_WIDGET (title), GTK_STATE_ACTIVE); + gtk_widget_show (priv->box); } else { - gtk_widget_set_state (GTK_WIDGET (title), GTK_STATE_NORMAL); gtk_widget_set_tooltip_text (priv->button, NULL); gtk_widget_set_tooltip_text (GTK_WIDGET (title), NULL); + gtk_widget_set_state (GTK_WIDGET (title), GTK_STATE_NORMAL); gtk_widget_hide (priv->box); } } @@ -288,42 +289,18 @@ on_active_window_changed (WnckScreen *screen, G_CALLBACK (on_icon_changed), title); g_signal_connect_after (act_window, "state-changed", G_CALLBACK (on_state_changed), title); - gtk_widget_show (priv->box); priv->window = act_window; - } - - if (WNCK_IS_WINDOW (act_window) - && !wnck_window_is_maximized (act_window) - && (priv->show_home_title ? type != WNCK_WINDOW_DESKTOP : 1)) - { - gtk_widget_set_state (GTK_WIDGET (title), GTK_STATE_NORMAL); - gtk_widget_hide (priv->box); - } - else if (!WNCK_IS_WINDOW (act_window)) - { - if (task_list_get_desktop_visible (TASK_LIST (task_list_get_default ())) - && priv->show_home_title) + if (wnck_window_is_maximized (act_window)) { - gtk_label_set_text (GTK_LABEL (priv->label), _("Home")); - gtk_image_set_from_pixbuf (GTK_IMAGE (priv->button_image), - priv->quit_icon); - gtk_widget_set_tooltip_text (priv->button, - _("Log off, switch user, lock screen or power " - "down the computer")); - gtk_widget_set_tooltip_text (GTK_WIDGET (title), - _("Home")); + gtk_widget_set_state (GTK_WIDGET (title), GTK_STATE_ACTIVE); gtk_widget_show (priv->box); - } + } else { gtk_widget_set_state (GTK_WIDGET (title), GTK_STATE_NORMAL); - gtk_widget_set_tooltip_text (priv->button, NULL); - gtk_widget_set_tooltip_text (GTK_WIDGET (title), NULL); gtk_widget_hide (priv->box); } } - else - gtk_widget_set_state (GTK_WIDGET (title), GTK_STATE_ACTIVE); gtk_widget_queue_draw (GTK_WIDGET (title)); } |