diff options
| -rw-r--r-- | applets/clock/calendar-window.c | 17 | ||||
| -rw-r--r-- | applets/clock/org.mate.panel.applet.clock.gschema.xml.in | 10 | ||||
| -rw-r--r-- | applets/wncklet/wayland-backend.c | 356 | ||||
| -rw-r--r-- | applets/wncklet/window-list.c | 4 |
4 files changed, 184 insertions, 203 deletions
diff --git a/applets/clock/calendar-window.c b/applets/clock/calendar-window.c index b6f25abd..bd117a3f 100644 --- a/applets/clock/calendar-window.c +++ b/applets/clock/calendar-window.c @@ -47,6 +47,8 @@ #ifdef HAVE_EDS #define KEY_SHOW_CALENDAR_EVENTS "show-calendar-events" #define KEY_SHOW_TASKS "show-tasks" +#define KEY_EXPAND_CALENDAR_EVENTS "expand-calendar-events" +#define KEY_EXPAND_TASKS "expand-tasks" #define SCHEMA_CALENDAR_APP "org.mate.desktop.default-applications.office.calendar" #define SCHEMA_TASKS_APP "org.mate.desktop.default-applications.office.tasks" #endif @@ -1096,7 +1098,7 @@ create_appointment_list (CalendarWindow *calwin, GtkCellRenderer *cell; frame = create_hig_calendar_frame (calwin, _("Appointments"), NULL, - KEY_SHOW_CALENDAR_EVENTS, NULL); + KEY_EXPAND_CALENDAR_EVENTS, NULL); list = gtk_tree_view_new (); gtk_tree_view_set_model (GTK_TREE_VIEW (list), @@ -1145,14 +1147,9 @@ create_appointment_list (CalendarWindow *calwin, gtk_widget_set_size_request (*scrolled_window, -1, 150); gtk_container_add (GTK_CONTAINER (*scrolled_window), list); + gtk_widget_show_all (*scrolled_window); gtk_container_add (GTK_CONTAINER (frame), *scrolled_window); - /* Ensure the scrolled window and tree view are visible */ - gtk_widget_show (*scrolled_window); - gtk_widget_show (list); - - /* Appointment list widgets created */ - *tree_view = list; return frame; } @@ -1168,7 +1165,7 @@ create_task_list (CalendarWindow *calwin, GtkCellRenderer *cell; frame = create_hig_calendar_frame (calwin, _("Tasks"), _("Add"), - KEY_SHOW_TASKS, G_CALLBACK (add_task)); + KEY_EXPAND_TASKS, G_CALLBACK (add_task)); list = gtk_tree_view_new (); gtk_tree_view_set_model (GTK_TREE_VIEW (list), @@ -1213,8 +1210,6 @@ create_task_list (CalendarWindow *calwin, gtk_widget_set_size_request (*scrolled_window, -1, 150); gtk_container_add (GTK_CONTAINER (*scrolled_window), list); - gtk_container_add (GTK_CONTAINER (frame), *scrolled_window); - /* Create task entry field */ calwin->priv->task_entry = gtk_entry_new (); gtk_entry_set_placeholder_text (GTK_ENTRY (calwin->priv->task_entry), _("Enter task description...")); @@ -1224,9 +1219,9 @@ create_task_list (CalendarWindow *calwin, g_signal_connect (calwin->priv->task_entry, "activate", G_CALLBACK (task_entry_activate_cb), calwin); gtk_container_add (GTK_CONTAINER (frame), calwin->priv->task_entry); - /* Ensure the scrolled window and tree view are visible */ gtk_widget_show (*scrolled_window); gtk_widget_show (list); + gtk_container_add (GTK_CONTAINER (frame), *scrolled_window); /* Hide task entry after all show operations are complete */ g_idle_add (hide_task_entry_idle, calwin); diff --git a/applets/clock/org.mate.panel.applet.clock.gschema.xml.in b/applets/clock/org.mate.panel.applet.clock.gschema.xml.in index ad822e46..88ad9189 100644 --- a/applets/clock/org.mate.panel.applet.clock.gschema.xml.in +++ b/applets/clock/org.mate.panel.applet.clock.gschema.xml.in @@ -94,5 +94,15 @@ <summary>Show tasks</summary> <description>If true, display tasks from Evolution in the calendar window.</description> </key> + <key name="expand-calendar-events" type="b"> + <default>true</default> + <summary>Expand calendar events</summary> + <description>If true, expand the calendar events section in the calendar window.</description> + </key> + <key name="expand-tasks" type="b"> + <default>true</default> + <summary>Expand tasks</summary> + <description>If true, expand the tasks section in the calendar window.</description> + </key> </schema> </schemalist> diff --git a/applets/wncklet/wayland-backend.c b/applets/wncklet/wayland-backend.c index b80f78a7..001149e7 100644 --- a/applets/wncklet/wayland-backend.c +++ b/applets/wncklet/wayland-backend.c @@ -37,6 +37,7 @@ /*In the future this could be changable from the panel-prefs dialog*/ static const int max_button_width = 180; static const int icon_size = 16; +int full_button_width; typedef struct { @@ -384,6 +385,104 @@ foreign_toplevel_handle_done (void *data, } static void +adjust_buttons (GtkContainer *outer_box, int button_space, int real_buttons, ToplevelTask *task) +{ + GtkWidget *widget, *button, *box; + + /*catch the case of an added button that can be missed + *Note that button space can come up zero on a first button + */ + if (real_buttons < 2) + { + if(task) + { + gtk_widget_set_size_request (task->button, full_button_width, -1); + } + } + + if ((task) && (button_space > 0) && (button_space < icon_size * 3)) + { + gtk_widget_hide (task->icon); + } + else if (task) + { + gtk_widget_show (task->icon); + } + + if ((task) && (button_space > 0) && (button_space < icon_size)) + { + gtk_widget_hide (task->label); + } + else if (task) + { + gtk_widget_show (task->label); + } + + GList* children = gtk_container_get_children (GTK_CONTAINER (outer_box)); + + while (children != NULL) + { + button = GTK_WIDGET (children->data); + box = gtk_bin_get_child (GTK_BIN (button)); + + if ((real_buttons < 2) || (real_buttons * full_button_width < tasklist_width * 0.75)) + { + gtk_widget_set_size_request (button, full_button_width, -1); + gtk_widget_show_all (button); + return; + } + else + { + gtk_widget_set_size_request (button, MIN(button_space, full_button_width), -1); + } + + /* if the number of buttons forces width to less than 3x the icon size, hide the icons + * if the number of buttons forces width to less than the icon size, hide the labels too. + * This is roughy the same behavior as on x11 + * To find the icon and label we must iterate through the children of the box we packed + * into the button, there are two of them + */ + + GList* contents = gtk_container_get_children (GTK_CONTAINER (box)); + while (contents != NULL) + { + widget = GTK_WIDGET (contents->data); + /*Show or hide the icon*/ + if (GTK_IS_IMAGE (widget)) + { + if ((button_space < icon_size * 3) && (button_space > 1)) + gtk_widget_hide (widget); + + else + gtk_widget_show (widget); + + } + + /*Show or hide the label*/ + if (GTK_IS_LABEL (widget)) + { + if ((button_space < icon_size) && (button_space > 1)) + { + gtk_widget_hide (widget); + /*We can go a little wider for empty buttons*/ + gtk_widget_set_size_request (button, tasklist_width / real_buttons * 0.9, -1); + if (task) + gtk_widget_hide (task->label); + + } + else + { + gtk_widget_show (widget); + } + } + contents = contents->next; + } + children = children->next; + } + return; +} + +static void foreign_toplevel_handle_closed (void *data, struct zwlr_foreign_toplevel_handle_v1 *toplevel) { @@ -392,13 +491,15 @@ foreign_toplevel_handle_closed (void *data, if (task->button) { GtkOrientation orient; - GtkWidget *button; - GtkWidget *box; - GtkWidget *outer_box = gtk_widget_get_parent (GTK_WIDGET (task->button)); + GtkWidget *outer_box, *parent_box; + int real_buttons, button_space; + + outer_box = gtk_widget_get_parent (GTK_WIDGET (task->button)); gtk_widget_destroy (task->button); buttons = buttons -1; + real_buttons = buttons / 2; - if (buttons == 0) + if (real_buttons == 0) return; /* We don't need to modify button size on a vertical panel*/ @@ -406,67 +507,15 @@ foreign_toplevel_handle_closed (void *data, if (orient == GTK_ORIENTATION_VERTICAL) return; - /* Horizontal panel: if buttons can now fit - * with both labels and icons show them + /*Get the box the tasklist outer box sits in + *and leave a little space so the buttons don't push other applets off the panel */ - if (tasklist_width / buttons > icon_size * 3) - { - GList* children = gtk_container_get_children (GTK_CONTAINER (outer_box)); - while (children != NULL) - { - button = GTK_WIDGET (children->data); - - /* If maximum width buttons fix, expand to that dimension*/ - if (buttons * max_button_width < tasklist_width) - gtk_widget_set_size_request (button, max_button_width, -1); - /* Otherwise expand remaining buttons to fill the tasklist*/ - else - gtk_widget_set_size_request (button, tasklist_width / buttons, -1); - - gtk_widget_show_all (button); - children = children->next; - } - } - /* If buttons with icons will fit, bring them back*/ - else if (tasklist_width / buttons > icon_size * 2) - { - GtkWidget *widget; - GList* children = gtk_container_get_children (GTK_CONTAINER (outer_box)); - while (children != NULL) - { - button = GTK_WIDGET (children->data); - box = gtk_bin_get_child (GTK_BIN (button)); - GList* contents = gtk_container_get_children (GTK_CONTAINER (box)); - while (contents != NULL) - { - widget = GTK_WIDGET (contents->data); - if (GTK_IS_LABEL (widget)) - gtk_widget_hide (widget); - - if (GTK_IS_IMAGE (widget)) - gtk_widget_show (widget); - - contents = contents->next; - gtk_widget_show (box); - gtk_widget_show (button); - } - - children = children->next; - gtk_widget_set_size_request (button, tasklist_width / buttons, -1); - } - } - /* If we still cannot fit labels or icons, just fill the available space*/ - else - { - GList* children = gtk_container_get_children (GTK_CONTAINER (outer_box)); - while (children != NULL) - { - button = GTK_WIDGET (children->data); - gtk_widget_set_size_request (button, tasklist_width / buttons, -1); - children = children->next; - } - } + parent_box = gtk_widget_get_ancestor ((outer_box), GTK_TYPE_BOX); + tasklist_width = MAX(gtk_widget_get_allocated_width (parent_box), tasklist_width) ; + button_space = (tasklist_width / real_buttons) * 0.75; + button_space = MIN(button_space, full_button_width); + adjust_buttons (GTK_CONTAINER(outer_box), button_space, real_buttons, NULL); } } @@ -574,8 +623,9 @@ static ToplevelTask * toplevel_task_new (TasklistManager *tasklist, struct zwlr_foreign_toplevel_handle_v1 *toplevel) { ToplevelTask *task = g_new0 (ToplevelTask, 1); - GtkWidget *button; GtkOrientation orient; + GtkWidget *whole_panel_box, *parent_box; + int real_buttons, button_space, panel_width; buttons = buttons + 1; orient = gtk_orientable_get_orientation (GTK_ORIENTABLE (tasklist->outer_box)); @@ -598,6 +648,19 @@ toplevel_task_new (TasklistManager *tasklist, struct zwlr_foreign_toplevel_handl gtk_widget_set_name (task->button , "tasklist-button"); gtk_widget_show_all (task->button); + task->toplevel = toplevel; + zwlr_foreign_toplevel_handle_v1_add_listener (toplevel, + &foreign_toplevel_handle_listener, + task); + g_object_set_data_full (G_OBJECT (task->button), + toplevel_task_key, + task, + (GDestroyNotify)toplevel_task_disconnected_from_widget); + + g_signal_connect (task->button, "button-press-event", + G_CALLBACK (on_toplevel_button_press), + tasklist); + /* Buttons on a vertical panel are not affected by how many are needed * GTK handles compressing contents as needed as the window width tells * GTK how much space to allocate the label and icon. Buttons will use @@ -606,23 +669,7 @@ toplevel_task_new (TasklistManager *tasklist, struct zwlr_foreign_toplevel_handl */ if (orient == GTK_ORIENTATION_VERTICAL) - { - gtk_widget_show_all (task->button); - task->toplevel = toplevel; - zwlr_foreign_toplevel_handle_v1_add_listener (toplevel, - &foreign_toplevel_handle_listener, - task); - g_object_set_data_full (G_OBJECT (task->button), - toplevel_task_key, - task, - (GDestroyNotify)toplevel_task_disconnected_from_widget); - - g_signal_connect (task->button, "button-press-event", - G_CALLBACK (on_toplevel_button_press), - tasklist); - - return task; - } + return task; /* On horizontal panels, GTK does not by default limit the width of the tasklist * as it does not run out of space in the window until the entire panel is used, @@ -631,129 +678,58 @@ toplevel_task_new (TasklistManager *tasklist, struct zwlr_foreign_toplevel_handl * Thus we must get the tasklist's allocated width when extra space remains, * which will be most of the distance between the handle and the next applet * From there, we can expand buttons and/or hide elements as needed + * For some reason this function always gets called twice, so use half the value of buttons + * but do not attempt to adjust the global value as it would get adjusted twice + * Since we are adding a button here the true value cannot be zero */ - - - tasklist_width = gtk_widget_get_allocated_width (GTK_WIDGET (tasklist->outer_box)); - - /* First button can be buggy with this so hardcode it to expand to the limit */ - if (buttons == 1) - gtk_widget_set_size_request (task->button, max_button_width, -1); - - /* if the number of buttons forces width to less than 3x the icon size, shrink them */ - if ((buttons != 0) && (tasklist_width > 1 )&& (tasklist_width / buttons < (icon_size * 3))) + whole_panel_box = gtk_widget_get_toplevel(GTK_WIDGET (tasklist->outer_box)); + parent_box = gtk_widget_get_ancestor(GTK_WIDGET (tasklist->outer_box), GTK_TYPE_BOX); + if (gtk_widget_get_allocated_width (parent_box) > 1) { - /* adjust the current button first or it can be missed */ - if (tasklist_width / buttons > icon_size * 2) - { - gtk_widget_hide (task->label); - gtk_widget_show (task->icon); - } - else - { - gtk_widget_show (task->label); - gtk_widget_hide (task->icon); - } - gtk_widget_show (box); - gtk_widget_show (task->button); - - /* iterate over all the buttons, first hide labels - * then hide icons and bring back labels - */ - GtkWidget *widget; + tasklist_width = gtk_widget_get_allocated_width (parent_box); + } + else + { + tasklist_width = MAX(gtk_widget_get_allocated_width (parent_box), tasklist_width); + } - GList* children = gtk_container_get_children (GTK_CONTAINER (tasklist->list)); - while (children != NULL) - { - button = GTK_WIDGET (children->data); - box = gtk_bin_get_child (GTK_BIN (button)); + panel_width = gtk_widget_get_allocated_width (whole_panel_box); - /* hide labels of all buttons but show icons if only icons will fit */ - if (tasklist_width / buttons > icon_size * 2) - { - /* find the icon and the label, show just the icon */ - GList* contents = gtk_container_get_children (GTK_CONTAINER (box)); + /*on startup we get an allocated with of zero, so start with 1/3 the panel width + *as a sane default + *This may overflow on very crowded panels where the tasklist is less than 1/3ed the + *panel witth but will self-correct on opening or closing a few windows + */ - while (contents != NULL) - { - widget = GTK_WIDGET (contents->data); - if (GTK_IS_LABEL (widget)) - gtk_widget_hide (widget); + if (tasklist_width <= 2) + tasklist_width = panel_width / 3; - if (GTK_IS_IMAGE (widget)) - gtk_widget_show (widget); + real_buttons = MAX ((buttons / 2), 1); - contents = contents->next; - } - } - else - { - /* find the icon and the label, show just the label as it is more - * compressable than the icon. Though less meaningful at this size, - * it is enough to keep the tasklist from disappearing on themes - * that do not set borders around tasklist buttons. - * This is same behavior as on x11 save that an extreme number of - * buttons (50+ on 700px of space) can still overflow - */ - - GList* contents = gtk_container_get_children (GTK_CONTAINER (box)); - while (contents != NULL) - { - widget = GTK_WIDGET (contents->data); - if (GTK_IS_LABEL (widget)) - gtk_widget_show (widget); + /*always allow at least three buttons to fit without adjustment + *so short window lists don't overflow + */ + if (tasklist_width > 0) + { + full_button_width = MIN(max_button_width, tasklist_width / 3); + } - if (GTK_IS_IMAGE (widget)) - gtk_widget_hide (widget); + /*Leave a little space so the buttons don't push other applets off the panel*/ + button_space = (tasklist_width / real_buttons) * 0.75; + button_space = MIN(button_space, full_button_width); - contents = contents->next; - } - } - /*expand buttons with labels or everything hidden to fit remaining space*/ - gtk_widget_set_size_request (button, tasklist_width / buttons, -1); - /*show the button and any contents that fit, then get the next button*/ - gtk_widget_show (box); - gtk_widget_show (button); + /* iterate over all the buttons*/ + adjust_buttons (GTK_CONTAINER (tasklist->list), button_space, real_buttons, task); - children = children->next; - } + /*Reset the tasklist width after button adjustments*/ + if (gtk_widget_get_allocated_width (parent_box) > 1) + { + tasklist_width = gtk_widget_get_allocated_width (parent_box); } else { - GList* children = gtk_container_get_children (GTK_CONTAINER(tasklist->list)); - while (children != NULL) - { - button = GTK_WIDGET (children->data); - if (((buttons ) * max_button_width < tasklist_width) || (buttons == 1)) - - /*Don't let buttons expand over the maximum button size*/ - gtk_widget_set_size_request (button, max_button_width, -1); - - else - /*if full width buttons won't fit, size them to just fill the tasklist*/ - gtk_widget_set_size_request (button, tasklist_width / buttons, -1); - - children = children->next; - } - gtk_widget_show_all (task->button); + tasklist_width = MAX(gtk_widget_get_allocated_width (parent_box), tasklist_width); } - - /*Reset the tasklist width after button adjustments*/ - tasklist_width = gtk_widget_get_allocated_width (GTK_WIDGET (tasklist->outer_box)); - - task->toplevel = toplevel; - zwlr_foreign_toplevel_handle_v1_add_listener (toplevel, - &foreign_toplevel_handle_listener, - task); - g_object_set_data_full (G_OBJECT (task->button), - toplevel_task_key, - task, - (GDestroyNotify)toplevel_task_disconnected_from_widget); - - g_signal_connect (task->button, "button-press-event", - G_CALLBACK (on_toplevel_button_press), - tasklist); - return task; } diff --git a/applets/wncklet/window-list.c b/applets/wncklet/window-list.c index c027e3f5..17821cdd 100644 --- a/applets/wncklet/window-list.c +++ b/applets/wncklet/window-list.c @@ -367,14 +367,14 @@ preview_window_reposition (WnckTasklist *tl, x_pos = monitor_geom.width + monitor_geom.x - width - tasklist->size - PREVIEW_PADDING; break; case MATE_PANEL_APPLET_ORIENT_RIGHT: - x_pos = tasklist->size + PREVIEW_PADDING; + x_pos = monitor_geom.x + tasklist->size + PREVIEW_PADDING; break; case MATE_PANEL_APPLET_ORIENT_UP: y_pos = monitor_geom.height + monitor_geom.y - height - tasklist->size - PREVIEW_PADDING; break; case MATE_PANEL_APPLET_ORIENT_DOWN: default: - y_pos = tasklist->size + PREVIEW_PADDING; + y_pos = monitor_geom.y + tasklist->size + PREVIEW_PADDING; break; } |