[Xfce4-commits] r25121 - in xfce4-panel/trunk: . panel

[Nick Schermer]

Author: nick
Date: 2007-03-05 21:01:11 +0000 (Mon, 05 Mar 2007)
New Revision: 25121

Modified:
   xfce4-panel/trunk/ChangeLog
   xfce4-panel/trunk/panel/panel-dialogs.c
Log:
	* panel/panel-dialogs.c: Set Full Height or Full Width based on the panel position.
	  This partly fixes Bug #2465.

Modified: xfce4-panel/trunk/ChangeLog
===================================================================
--- xfce4-panel/trunk/ChangeLog	2007-03-05 20:25:35 UTC (rev 25120)
+++ xfce4-panel/trunk/ChangeLog	2007-03-05 21:01:11 UTC (rev 25121)
@@ -1,3 +1,8 @@
+2007-03-05 21:55  nick
+
+	* panel/panel-dialogs.c: Set Full Height or Full Width based on the panel position.
+	  This partly fixes Bug #2465.
+
 2007-03-05 21:21  nick
 
 	* plugins/launcher/launcher.c: Replace the enter/leave signals since there are

Modified: xfce4-panel/trunk/panel/panel-dialogs.c
===================================================================
--- xfce4-panel/trunk/panel/panel-dialogs.c	2007-03-05 20:25:35 UTC (rev 25120)
+++ xfce4-panel/trunk/panel/panel-dialogs.c	2007-03-05 21:01:11 UTC (rev 25121)
@@ -898,10 +898,17 @@
                                 pmd->n_width_items - 1);
                     }
 
-                    gtk_combo_box_append_text (GTK_COMBO_BOX (pmd->fullwidth),
-                                               _("Normal Width"));
-                    gtk_combo_box_append_text (GTK_COMBO_BOX (pmd->fullwidth),
-                                               _("Full Width"));
+                    if (xfce_screen_position_is_horizontal (i+1))
+                    {
+                        gtk_combo_box_append_text (GTK_COMBO_BOX (pmd->fullwidth), _("Normal Width"));
+                        gtk_combo_box_append_text (GTK_COMBO_BOX (pmd->fullwidth), _("Full Width"));
+                    }
+                    else
+                    {
+                        gtk_combo_box_append_text (GTK_COMBO_BOX (pmd->fullwidth), _("Normal Height"));
+                        gtk_combo_box_append_text (GTK_COMBO_BOX (pmd->fullwidth), _("Full Height"));
+                    }
+
                     pmd->n_width_items = 2;
                     if (can_span_monitors(pmd->panel))
                     {
@@ -1127,10 +1134,18 @@
     gtk_widget_show (pmd->fullwidth);
     gtk_box_pack_start (GTK_BOX (vbox), pmd->fullwidth, FALSE, FALSE, 0);
 
-    gtk_combo_box_append_text (GTK_COMBO_BOX (pmd->fullwidth),
-                               _("Normal Width"));
-    gtk_combo_box_append_text (GTK_COMBO_BOX (pmd->fullwidth),
-                               _("Full Width"));
+    if (panel_is_horizontal (pmd->panel))
+    {
+        gtk_combo_box_append_text (GTK_COMBO_BOX (pmd->fullwidth), _("Normal Width"));
+        gtk_combo_box_append_text (GTK_COMBO_BOX (pmd->fullwidth), _("Full Width"));
+    }
+    else
+    {
+        gtk_combo_box_append_text (GTK_COMBO_BOX (pmd->fullwidth), _("Normal Height"));
+        gtk_combo_box_append_text (GTK_COMBO_BOX (pmd->fullwidth), _("Full Height"));
+    }
+
+
     pmd->n_width_items = 2;
     if (can_span_monitors (pmd->panel))
     {