diff options
| author | Nick Schermer <nick@xfce.org> | 2007-03-05 21:01:11 +0000 |
|---|---|---|
| committer | Nick Schermer <nick@xfce.org> | 2007-03-05 21:01:11 +0000 |
| commit | 7ec644952a756bec8dfeb7da9da2a337acf4756e (patch) | |
| tree | e4429fdad4a2d9863bd085aa7bfb01c9851cce5e /panel | |
| parent | 8b64b727ad8e978c2cb5a4a0d8778892af636fff (diff) | |
* panel/panel-dialogs.c: Set Full Height or Full Width based on the panel position.
This partly fixes Bug #2465.
(Old svn revision: 25121)
Diffstat (limited to 'panel')
| -rw-r--r-- | panel/panel-dialogs.c | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/panel/panel-dialogs.c b/panel/panel-dialogs.c index a751343a..1d0e335f 100644 --- a/panel/panel-dialogs.c +++ b/panel/panel-dialogs.c @@ -898,10 +898,17 @@ screen_position_pressed (GtkToggleButton *tb, 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 @@ add_position_options (GtkBox *box, 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)) { |