fix: set context to current with surface

Author: wash2

cosmic-panel-bin/src/space/overflow.rs

@@ -9,7 +9,7 @@ use cosmic_panel_config::PanelAnchor;
 use sctk::shell::WaylandSurface;
 use smithay::{
     self,
-    backend::renderer::damage::OutputDamageTracker,
+    backend::renderer::{damage::OutputDamageTracker, gles::GlesRenderer},
     desktop::space::SpaceElement,
     utils::{Rectangle, Size},
 };
@@ -169,7 +169,7 @@ impl PanelSpace {
         (element, popup_element.cloned())
     }
 
-    pub fn handle_overflow_popup_events(&mut self) {
+    pub fn handle_overflow_popup_events(&mut self, renderer: &mut GlesRenderer) {
         self.overflow_popup = self
             .overflow_popup
             .take()
@@ -180,7 +180,9 @@ impl PanelSpace {
                     p.rectangle = Rectangle::from_loc_and_size((x, y), (width, height));
                     let scaled_size: Size<i32, _> =
                         p.rectangle.size.to_f64().to_physical(p.scale).to_i32_round();
+
                     if let Some(s) = p.egl_surface.as_ref() {
+                        _ = unsafe { renderer.egl_context().make_current_with_surface(s) };
                         // TODO do we need to have the renderer for
                         s.resize(scaled_size.w.max(1), scaled_size.h.max(1), 0, 0);
                     }

cosmic-panel-bin/src/space/panel_space.rs

@@ -905,7 +905,7 @@ impl PanelSpace {
             let prev = self.popups.len();
             self.popups.retain_mut(|p: &mut WrapperPopup| p.handle_events(popup_manager, renderer));
             self.subsurfaces.retain_mut(|s: &mut WrapperSubsurface| s.handle_events());
-            self.handle_overflow_popup_events();
+            self.handle_overflow_popup_events(renderer);
 
             if prev == self.popups.len() && should_render {
                 if let Err(e) = self.render(renderer, time, throttle, qh) {

cosmic-panel-bin/src/space/render.rs

@@ -379,10 +379,11 @@ impl PanelSpace {
                 && subsurface.subsurface.c_surface.is_alive()
                 && subsurface.subsurface.has_frame
         }) {
-            let age = subsurface.subsurface.egl_surface.buffer_age().unwrap_or_default() as usize;
             _ = unsafe {
                 renderer.egl_context().make_current_with_surface(&subsurface.subsurface.egl_surface)
             };
+            let age = subsurface.subsurface.egl_surface.buffer_age().unwrap_or_default() as usize;
+
             let mut f = renderer.bind(&mut subsurface.subsurface.egl_surface)?;
 
             let mut loc = subsurface.subsurface.rectangle.loc;

cosmic-panel-bin/src/xdg_shell_wrapper/client/handlers/wp_security_context.rs

@@ -54,10 +54,12 @@ impl SecurityContextManager {
         let addr = SocketAddr::from_abstract_name(s)?;
         // this also listens on the socket
         let listener = UnixListener::bind_addr(&addr)?;
-        let wp_security_context =
-            self.manager.create_listener(listener.as_fd(), close_fd.as_fd(), qh, SecurityContext {
-                conn: Arc::new(Mutex::new(None)),
-            });
+        let wp_security_context = self.manager.create_listener(
+            listener.as_fd(),
+            close_fd.as_fd(),
+            qh,
+            SecurityContext { conn: Arc::new(Mutex::new(None)) },
+        );
         let conn = UnixStream::connect_addr(&addr)?;
         // XXX make sure no one else can connect to the listener
         drop(close_fd_ours);