Remove spurious tabs in labels in panel-pref.glade 0.5.3
authormartyj19 <martyj19@comcast.net>
Sun, 9 Aug 2009 14:34:33 +0000 (14:34 +0000)
committermartyj19 <martyj19@comcast.net>
Sun, 9 Aug 2009 14:34:33 +0000 (14:34 +0000)
Fix failure to honor configured width when loading a vertical panel
Release 0.5.3

configure.ac
data/ui/panel-pref.glade
src/panel.c

index ead9832..0c8944a 100644 (file)
@@ -1,5 +1,5 @@
 AC_PREREQ(2.53)
-AC_INIT(lxpanel, 0.5.2, http://lxde.org/)
+AC_INIT(lxpanel, 0.5.3, http://lxde.org/)
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([src/bg.c])
 AC_CONFIG_HEADER([config.h])
index 66b4b13..0052106 100644 (file)
                                 </child>
                                 <child>
                                   <object class="GtkRadioButton" id="edge_top">
-                                    <property name="label" translatable="yes">Top      </property>
+                                    <property name="label" translatable="yes">Top</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
                                 <property name="orientation">vertical</property>
                                 <child>
                                   <object class="GtkRadioButton" id="alignment_left">
-                                    <property name="label" translatable="yes">Left     </property>
+                                    <property name="label" translatable="yes">Left</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
index 49f79c4..e3bef35 100644 (file)
@@ -89,6 +89,7 @@ static Panel* panel_allocate(void)
 {
     Panel* p = g_new0(Panel, 1);
     p->allign = ALLIGN_CENTER;
+    p->orientation = ORIENT_NONE;
     p->edge = EDGE_NONE;
     p->widthtype = WIDTH_PERCENT;
     p->width = 100;
@@ -1058,7 +1059,8 @@ void panel_set_panel_configuration_changed(Panel *p)
     if (previous_orientation != p->orientation)
     {
         panel_adjust_geometry_terminology(p);
-        p->height = ((p->orientation == ORIENT_HORIZ) ? PANEL_HEIGHT_DEFAULT : PANEL_WIDTH_DEFAULT);
+        if (previous_orientation != ORIENT_NONE)
+            p->height = ((p->orientation == ORIENT_HORIZ) ? PANEL_HEIGHT_DEFAULT : PANEL_WIDTH_DEFAULT);
         if (p->height_control != NULL)
             gtk_spin_button_set_value(GTK_SPIN_BUTTON(p->height_control), p->height);
         if ((p->widthtype == WIDTH_PIXEL) && (p->width_control != NULL))