aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS4
-rw-r--r--src/menubar.vala1
-rw-r--r--src/prompt-box.vala3
3 files changed, 6 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index d85af58..7ec97ed 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,3 @@
-Overview of changes in arctica-greeter 14.04.10
+Overview of changes in arctica-greeter 0.99.0.1
- - Fork from Unity Greeter 14.04.10. \ No newline at end of file
+ - Fork from Unity Greeter 14.04.11.
diff --git a/src/menubar.vala b/src/menubar.vala
index 128be17..2af4f2d 100644
--- a/src/menubar.vala
+++ b/src/menubar.vala
@@ -231,6 +231,7 @@ public class MenuBar : Gtk.MenuBar
var item = new Gtk.CheckMenuItem.with_label (_("Screen Reader"));
item.toggled.connect (screen_reader_toggled_cb);
item.add_accelerator ("activate", accel_group, Gdk.Key.s, Gdk.ModifierType.CONTROL_MASK, Gtk.AccelFlags.VISIBLE);
+ item.add_accelerator ("activate", accel_group, Gdk.Key.s, Gdk.ModifierType.SUPER_MASK | Gdk.ModifierType.MOD1_MASK, Gtk.AccelFlags.VISIBLE);
item.show ();
submenu.append (item);
item.set_active (UGSettings.get_boolean (UGSettings.KEY_SCREEN_READER));
diff --git a/src/prompt-box.vala b/src/prompt-box.vala
index 50c46d1..075a6ba 100644
--- a/src/prompt-box.vala
+++ b/src/prompt-box.vala
@@ -283,6 +283,9 @@ public class PromptBox : FadableBox
base.get_preferred_height (out min, out nat);
min = round_to_grid (min + GreeterList.BORDER * 2) - GreeterList.BORDER * 2;
nat = round_to_grid (nat + GreeterList.BORDER * 2) - GreeterList.BORDER * 2;
+
+ if (position <= -1 || position >= 1)
+ min = nat = grid_size;
}
public void set_zone (Gtk.Widget zone)