Make popup window modal

Fixes #5 and #21
p-e-w · Apr 23, 2017 · d52b395 · d52b395
1 parent 975c69d
commit d52b395
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 13 deletions.
diff --git a/src/Module.vala b/src/Module.vala
@@ -60,10 +60,6 @@ namespace Plotinus {
           var commands = command_extractor.get_window_commands(window);
 
           if (commands.length > 0) {
-            if ((window.get_window().get_state() & Gdk.WindowState.FULLSCREEN) == Gdk.WindowState.FULLSCREEN)
-              // The popup cannot be shown while the parent window is in fullscreen state
-              window.unfullscreen();
-
             var popup_window = new PopupWindow(commands);
             popup_window.transient_for = window;
             popup_window.show_all();

diff --git a/src/PopupWindow.vala b/src/PopupWindow.vala
@@ -16,9 +16,7 @@ class Plotinus.PopupWindow : Gtk.Window {
   public PopupWindow(Command[] commands) {
     skip_taskbar_hint = true;
     destroy_with_parent = true;
-
-    window_position = Gtk.WindowPosition.CENTER_ON_PARENT;
-    set_keep_above(true);
+    modal = true;
 
     // Width is determined by the width of the search entry
     set_default_size(-1, 300);
@@ -59,12 +57,6 @@ class Plotinus.PopupWindow : Gtk.Window {
     });
     command_list.row_activated.connect(() => search_entry.activate());
 
-    add_events(Gdk.EventMask.FOCUS_CHANGE_MASK);
-    focus_out_event.connect(() => {
-      destroy();
-      return true;
-    });
-
     add_events(Gdk.EventMask.KEY_PRESS_MASK);
     key_press_event.connect((event) => {
       if (event.keyval == Gdk.Key.Escape) {