@@ -35,26 +35,23 @@ public class Gala.HidableWindow : GLib.Object {
3535 window. position_changed. connect (on_window_position_changed);
3636 }
3737
38- private void on_window_position_changed (Meta .Window ? _window ) {
39- if (_window == null ) {
40- return ;
41- }
42-
43- var rect = _window. get_frame_rect ();
38+ private void on_window_position_changed () {
39+ var rect = window. get_frame_rect ();
4440
4541 if (rect. x != OUT_OF_BOUNDS ) {
4642 actual_x = rect. x;
4743 Idle . add_once (() = > {
48- unowned var actor = (Meta . WindowActor ) _window . get_compositor_private ();
44+ unowned var actor = (Meta . WindowActor ) window . get_compositor_private ();
4945 if (actor != null ) {
5046 x = actor. x;
5147 }
5248 });
5349 }
50+
5451 if (rect. y != OUT_OF_BOUNDS ) {
5552 actual_y = rect. y;
5653 Idle . add_once (() = > {
57- unowned var actor = (Meta . WindowActor ) _window . get_compositor_private ();
54+ unowned var actor = (Meta . WindowActor ) window . get_compositor_private ();
5855 if (actor != null ) {
5956 y = actor. y;
6057 }
@@ -63,27 +60,23 @@ public class Gala.HidableWindow : GLib.Object {
6360 }
6461
6562 public void hide_window () {
66- if (Meta . Util . is_wayland_compositor ()) {
67- unowned var actor = (Meta . WindowActor ) _window. get_compositor_private ();
68- if (actor == null ) {
69- return ;
70- }
71-
72- actor. visible = false ;
73- } else {
63+ unowned var actor = (Meta . WindowActor ) _window. get_compositor_private ();
64+ if (actor != null ) {
65+ actor. visible = false ;;
66+ }
67+
68+ if (! Meta . Util . is_wayland_compositor ()) {
7469 window. move_frame (false , HidableWindow . OUT_OF_BOUNDS , HidableWindow . OUT_OF_BOUNDS );
7570 }
7671 }
7772
7873 public void show_window () {
79- if (Meta . Util . is_wayland_compositor ()) {
80- unowned var actor = (Meta . WindowActor ) _window. get_compositor_private ();
81- if (actor == null ) {
82- return ;
83- }
84-
74+ unowned var actor = (Meta . WindowActor ) _window. get_compositor_private ();
75+ if (actor != null ) {
8576 actor. visible = true ;
86- } else {
77+ }
78+
79+ if (! Meta . Util . is_wayland_compositor ()) {
8780 window. move_frame (false , actual_x, actual_y);
8881 }
8982 }
0 commit comments