aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2012-03-16 01:45:21 +0800
committerMilan Crha <mcrha@redhat.com>2012-03-16 01:45:21 +0800
commit648d2a33cebb27c6b8d5d65f5fc8716cbded3135 (patch)
tree583f1272c4cf1adaac1a50f4cc6c4a1ae01f71e7 /shell
parent6e51aa3332ef8698a87594f88651a1d30fb5221a (diff)
downloadgsoc2013-evolution-648d2a33cebb27c6b8d5d65f5fc8716cbded3135.tar
gsoc2013-evolution-648d2a33cebb27c6b8d5d65f5fc8716cbded3135.tar.gz
gsoc2013-evolution-648d2a33cebb27c6b8d5d65f5fc8716cbded3135.tar.bz2
gsoc2013-evolution-648d2a33cebb27c6b8d5d65f5fc8716cbded3135.tar.lz
gsoc2013-evolution-648d2a33cebb27c6b8d5d65f5fc8716cbded3135.tar.xz
gsoc2013-evolution-648d2a33cebb27c6b8d5d65f5fc8716cbded3135.tar.zst
gsoc2013-evolution-648d2a33cebb27c6b8d5d65f5fc8716cbded3135.zip
Bug #669490 - Window resizes with many activities (gtk 3.3.14+)
Diffstat (limited to 'shell')
-rw-r--r--shell/e-shell-taskbar.c18
1 files changed, 15 insertions, 3 deletions
diff --git a/shell/e-shell-taskbar.c b/shell/e-shell-taskbar.c
index 3dd995ded1..e272524fa1 100644
--- a/shell/e-shell-taskbar.c
+++ b/shell/e-shell-taskbar.c
@@ -274,9 +274,6 @@ shell_taskbar_constructed (GObject *object)
shell_backend, "activity-added",
G_CALLBACK (shell_taskbar_activity_add), shell_taskbar);
- /* Do not enlarge window width on new activities. */
- gtk_widget_set_size_request (GTK_WIDGET (shell_taskbar), 0, -1);
-
e_extensible_load_extensions (E_EXTENSIBLE (object));
/* Chain up to parent's constructed() method. */
@@ -319,6 +316,20 @@ shell_taskbar_get_preferred_height (GtkWidget *widget,
}
static void
+shell_taskbar_get_preferred_width (GtkWidget *widget,
+ gint *minimum_width,
+ gint *natural_width)
+{
+ /* to never get larger than allocated size (which changes window width) */
+
+ if (minimum_width != NULL)
+ *minimum_width = 1;
+
+ if (natural_width != NULL)
+ *natural_width = 1;
+}
+
+static void
e_shell_taskbar_class_init (EShellTaskbarClass *class)
{
GObjectClass *object_class;
@@ -336,6 +347,7 @@ e_shell_taskbar_class_init (EShellTaskbarClass *class)
widget_class = GTK_WIDGET_CLASS (class);
widget_class->size_allocate = shell_taskbar_size_allocate;
widget_class->get_preferred_height = shell_taskbar_get_preferred_height;
+ widget_class->get_preferred_width = shell_taskbar_get_preferred_width;
/**
* EShellTaskbar:message