search-menu: Drop gtk4-layer-shell in favor of fullscreen and exit on Esc

applets/search-menu/__init__.py

@@ -29,9 +29,8 @@ import panorama_panel

                                
                                
                                
                            
                                
                                    
                                        
                                            29  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            30  
                                            import gi
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            31  
                                            gi.require_version("Gtk", "4.0")
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        32 -
                                        gi.require_version("Gtk4LayerShell", "1.0")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            32  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        34 -
                                        from gi.repository import Gtk, GLib, Gtk4LayerShell, Gio, Gdk, Pango
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        33 +
                                        from gi.repository import Gtk, GLib, Gio, Gdk, Pango
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            34  
                                            import subprocess
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            35  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            36  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -60,6 +59,7 @@ class WayfireLogoutUI(Gtk.Window):

                                
                                
                                
                            
                                
                                    
                                        
                                            59  
                                                def __init__(self):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            60  
                                                    super().__init__()
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            61  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        62 +
                                                self.set_application(Gtk.Application(application_id="com.roundabout_host.panorama.logout"))
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            63  
                                                    hbox = Gtk.CenterBox()
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            64  
                                                    main_layout = Gtk.Grid()
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            65  
                                                    suspend = create_logout_ui_button("emblem-synchronizing", "Suspend")
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -94,15 +94,9 @@ class WayfireLogoutUI(Gtk.Window):

                                
                                
                                
                            
                                
                                    
                                        
                                            94  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            95  
                                                    main_layout.set_row_spacing(LOGOUT_BUTTON_MARGIN)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            96  
                                                    main_layout.set_column_spacing(LOGOUT_BUTTON_MARGIN)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        97 -
                                                # Make surfaces layer shell
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        98 -
                                                Gtk4LayerShell.init_for_window(self)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        99 -
                                                Gtk4LayerShell.set_namespace(self, "com.roundabout_host.panorama.logout")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        100 -
                                                Gtk4LayerShell.set_layer(self, Gtk4LayerShell.Layer.OVERLAY)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        101 -
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        102 -
                                                Gtk4LayerShell.set_anchor(self, Gtk4LayerShell.Edge.TOP, True)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        103 -
                                                Gtk4LayerShell.set_anchor(self, Gtk4LayerShell.Edge.BOTTOM, True)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        104 -
                                                Gtk4LayerShell.set_anchor(self, Gtk4LayerShell.Edge.LEFT, True)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        105 -
                                                Gtk4LayerShell.set_anchor(self, Gtk4LayerShell.Edge.RIGHT, True)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        97 +
                                                key_controller = Gtk.EventControllerKey()
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        98 +
                                                key_controller.connect("key-pressed", self.on_key_press)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        99 +
                                                self.add_controller(key_controller)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            100  
                                                    main_layout.set_valign(Gtk.Align.CENTER)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            101  
                                                    hbox.set_center_widget(main_layout)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            102  
                                                    hbox.set_hexpand(True)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -113,6 +107,13 @@ class WayfireLogoutUI(Gtk.Window):

                                
                                
                                
                            
                                
                                    
                                        
                                            107  
                                                    css_provider = Gtk.CssProvider()
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            108  
                                                    css_provider.load_from_data("window.logout { background-color: rgba(0, 0, 0, 0.5); }")
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            109  
                                                    Gtk.StyleContext.add_provider_for_display(display, css_provider, Gtk.STYLE_PROVIDER_PRIORITY_USER)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        110 +
                                                self.fullscreen()
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        111 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        112 +
                                            def on_key_press(self, controller, keyval, keycode, state):
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        113 +
                                                if keyval == Gdk.KEY_Escape:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        114 +
                                                    self.hide()
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        115 +
                                                    return True
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        116 +
                                                return False
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            117  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            118  
                                                def on_suspend_click(self, button):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            119  
                                                    GLib.spawn_command_line_async("systemctl suspend")