diff options
| author | Gordon Norman Squash <[email protected]> | 2024-10-14 22:47:26 -0400 |
|---|---|---|
| committer | Luke from DC <[email protected]> | 2025-04-24 06:55:02 +0000 |
| commit | 17fd56f0680672f330f06ed566c50e366f51b14a (patch) | |
| tree | f5b3eaea3d184adb1853fc958dc36e704d28234c | |
| parent | b0d238cb955c8ea08573aac870b57787fe72683c (diff) | |
| download | mate-panel-17fd56f0680672f330f06ed566c50e366f51b14a.tar.bz2 mate-panel-17fd56f0680672f330f06ed566c50e366f51b14a.tar.xz | |
Before this commit, the Clock Applet's popup window would expand off the
screen if the user added more than a few locations to the Locations list.
In addition, the list of locations in the Clock Applet Preferences could get
extremely tall as well, and could even push the bottom part of the
Preferences dialog off the screen.
This commit adds (vertical) scrollbars to both widgets.
| -rw-r--r-- | applets/clock/clock.c | 17 | ||||
| -rw-r--r-- | applets/clock/clock.ui | 3 |
2 files changed, 16 insertions, 4 deletions
diff --git a/applets/clock/clock.c b/applets/clock/clock.c index e823d37c..fee7edf2 100644 --- a/applets/clock/clock.c +++ b/applets/clock/clock.c @@ -1248,6 +1248,7 @@ location_tile_need_clock_format_cb(ClockLocationTile *tile, gpointer data) static void create_cities_section (ClockData *cd) { + GtkWidget *cities_box; GSList *node; GSList *cities; GSList *l; @@ -1261,8 +1262,16 @@ create_cities_section (ClockData *cd) g_slist_free (cd->location_tiles); cd->location_tiles = NULL; - cd->cities_section = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); - gtk_container_set_border_width (GTK_CONTAINER (cd->cities_section), 0); + cd->cities_section = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (cd->cities_section), + GTK_POLICY_NEVER, + GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (cd->cities_section), + GTK_SHADOW_NONE); + gtk_scrolled_window_set_propagate_natural_height (GTK_SCROLLED_WINDOW (cd->cities_section), + TRUE); + + cities_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); cities = cd->locations; if (g_slist_length (cities) == 0) { @@ -1284,7 +1293,7 @@ create_cities_section (ClockData *cd) g_signal_connect (city, "need-clock-format", G_CALLBACK (location_tile_need_clock_format_cb), cd); - gtk_box_pack_start (GTK_BOX (cd->cities_section), + gtk_box_pack_start (GTK_BOX (cities_box), GTK_WIDGET (city), FALSE, FALSE, 0); @@ -1295,6 +1304,8 @@ create_cities_section (ClockData *cd) g_slist_free (node); + gtk_container_add (GTK_CONTAINER (cd->cities_section), cities_box); + gtk_box_pack_end (GTK_BOX (cd->clock_vbox), cd->cities_section, FALSE, FALSE, 0); diff --git a/applets/clock/clock.ui b/applets/clock/clock.ui index fb62507c..b4c4f1b8 100644 --- a/applets/clock/clock.ui +++ b/applets/clock/clock.ui @@ -606,8 +606,9 @@ <object class="GtkScrolledWindow" id="scrolledwindow10"> <property name="visible">True</property> <property name="can-focus">True</property> + <property name="expand">True</property> <property name="hscrollbar-policy">never</property> - <property name="vscrollbar-policy">never</property> + <property name="vscrollbar-policy">automatic</property> <property name="shadow-type">in</property> <child> <object class="GtkTreeView" id="cities_list"> |