From 0e6d815f3008e8bd073505d0d7228186414364d5 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@canonical.com>
Date: Wed, 12 Nov 2008 13:31:15 +0000
Subject: [PATCH] Pop up "Other options" menu after pressing F6 just once,
 rather than requiring two presses (LP: #294840).

---
 debian/changelog |  7 +++++++
 dia_options.inc  | 26 ++------------------------
 panel.inc        |  2 +-
 3 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d1155d0..584a265 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gfxboot-theme-ubuntu (0.7.0) UNRELEASED; urgency=low
+
+  * Pop up "Other options" menu after pressing F6 just once, rather than
+    requiring two presses (LP: #294840).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 12 Nov 2008 13:29:44 +0000
+
 gfxboot-theme-ubuntu (0.6.11) jaunty; urgency=low
 
   * Add localisation for "Dell Automatic Reinstall" (LP: #296476)
diff --git a/dia_options.inc b/dia_options.inc
index da8826d..22fe788 100644
--- a/dia_options.inc
+++ b/dia_options.inc
@@ -24,29 +24,7 @@
     "" ne { boot.ed ' ' edit.input } if
   } if
 
-  /window.action actRedraw def
-} def
-
-
-% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-% Return width of options entry.
-%
-% ( ) => ( width )
-%
-/panel.options.width {
-  txt_other_options strsize pop
-} def
+  main.redraw
 
-
-% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-% Redraw panel entry.
-%
-% ( panel ) => ( )
-%
-/panel.options.update {
-  panel.text.moveto
-
-  txt_other_options show
+  panel.fulloptions
 } def
-
-
diff --git a/panel.inc b/panel.inc
index 1ce78f1..5111ea1 100644
--- a/panel.inc
+++ b/panel.inc
@@ -46,7 +46,7 @@
       [ .panel.both [ keyF4 0 "F4" /panel.modes /panel.modes.width /panel.modes.update /modes.init ] ]
       [ .panel.both [ keyF5 0 "F5" /panel.access /panel.access.width /panel.access.update /access.init ] ]
 
-      [ .panel.short [ keyF6 0 "F6" /panel.options /panel.options.width /panel.options.update .undef ] ]
+      [ .panel.short [ keyF6 0 "F6" /panel.options /panel.fulloptions.width /panel.fulloptions.update .undef ] ]
 
       [ .panel.full [ keyF6 0 "F6" /panel.fulloptions /panel.fulloptions.width /panel.fulloptions.update /fulloptions.init ] ]