Skip to content

PantheonShell: match function order in Gala #875

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
danirabbit wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −21
Draft

PantheonShell: match function order in Gala #875

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions compositor/PantheonShell.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,27 @@ namespace GreeterCompositor {
focus (panel_surface.wayland_surface);
}

internal static void focus_extended_behavior (Wl.Client client, Wl.Resource resource) {
unowned ExtendedBehaviorSurface? extended_behavior_surface = resource.get_user_data<ExtendedBehaviorSurface> ();
if (extended_behavior_surface.wayland_surface == null) {
warning ("Window tried to focus but wayland surface is null.");
return;
}

focus (extended_behavior_surface.wayland_surface);
}

internal static void focus (Object wayland_surface) {
Meta.Window? window;
wayland_surface.get ("window", out window, null);
if (window == null) {
warning ("Window tried to focus but wayland surface had no associated window.");
return;
}

window.focus (window.get_display ().get_current_time ());
}

internal static void set_size (Wl.Client client, Wl.Resource resource, int width, int height) {
unowned PanelSurface? panel_surface = resource.get_user_data<PanelSurface> ();
if (panel_surface.wayland_surface == null) {
Expand Down Expand Up @@ -370,27 +391,6 @@ namespace GreeterCompositor {
ShellClientsManager.get_instance ().init_greeter (window);
}

internal static void focus_extended_behavior (Wl.Client client, Wl.Resource resource) {
unowned ExtendedBehaviorSurface? extended_behavior_surface = resource.get_user_data<ExtendedBehaviorSurface> ();
if (extended_behavior_surface.wayland_surface == null) {
warning ("Window tried to focus but wayland surface is null.");
return;
}

focus (extended_behavior_surface.wayland_surface);
}

internal static void focus (Object wayland_surface) {
Meta.Window? window;
wayland_surface.get ("window", out window, null);
if (window == null) {
warning ("Window tried to focus but wayland surface had no associated window.");
return;
}

window.focus (window.get_display ().get_current_time ());
}

internal static void set_keep_above (Wl.Client client, Wl.Resource resource) {
unowned ExtendedBehaviorSurface? eb_surface = resource.get_user_data<ExtendedBehaviorSurface> ();
if (eb_surface.wayland_surface == null) {
Expand Down
Loading