From 3f3f2081d7f5d274f6bc43de609a0f9879de67e4 Mon Sep 17 00:00:00 2001 From: mishas Date: Fri, 23 Mar 2007 14:43:40 +0000 Subject: [PATCH] fixed the minimum size problem git-svn-id: file:///svnroot/simple-launcher/trunk@116 3ba93dab-e023-0410-b42a-de7732cf370a --- debian/changelog | 6 ++++++ simple-launcher.cc | 13 +++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index a24a922..8bf8b5d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +simple-launcher (0.9.1) unstable; urgency=low + + * fixed the minimum size problem + + -- Mikhail Sobolev Fri, 23 Mar 2007 16:43:05 +0200 + simple-launcher (0.9) unstable; urgency=low * preparing the release :) diff --git a/simple-launcher.cc b/simple-launcher.cc index 93de8fb..47c61cd 100644 --- a/simple-launcher.cc +++ b/simple-launcher.cc @@ -274,15 +274,12 @@ void SimpleLauncherApplet::updateWidget() { } } - if (button_no) { - gtk_container_add(GTK_CONTAINER(myWidget), GTK_WIDGET(toolbar)); - if (button_no == 0) { - gtk_widget_set_size_request(myWidget, SL_APPLET_ICON_SIZE+SL_APPLET_CANVAS_SIZE, SL_APPLET_ICON_SIZE+SL_APPLET_CANVAS_SIZE); - } else { - gtk_widget_set_size_request(myWidget, button_no*(SL_APPLET_ICON_SIZE+SL_APPLET_CANVAS_SIZE), SL_APPLET_ICON_SIZE+SL_APPLET_CANVAS_SIZE); - } + gtk_container_add(GTK_CONTAINER(myWidget), GTK_WIDGET(toolbar)); + + if (button_no == 0) { + gtk_widget_set_size_request(myWidget, SL_APPLET_ICON_SIZE+SL_APPLET_CANVAS_SIZE, SL_APPLET_ICON_SIZE+SL_APPLET_CANVAS_SIZE); } else { - gtk_widget_destroy(GTK_WIDGET(toolbar)); + gtk_widget_set_size_request(myWidget, button_no*(SL_APPLET_ICON_SIZE+SL_APPLET_CANVAS_SIZE), SL_APPLET_ICON_SIZE+SL_APPLET_CANVAS_SIZE); } gtk_widget_show_all(myWidget); -- 1.7.9.5