elementary/gala
1
1
Fork 0
mirror of https://github.com/elementary/gala.git synced 2024-09-11 07:05:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

pip: Avoid to keep the Rect as a property

Browse Source 
This property is only used internally and can be retreived using the proper accessor.
This commit is contained in:
Corentin Noël 2020-03-11 10:48:22 +01:00
parent 8b6939d79a
commit 568151d9cf
2 changed files with 36 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/pip/Main.vala
View File

@ -89,9 +89,10 @@ public class Gala.Plugins.PIP.Plugin : Gala.Plugin {
int point_y = y - (int)active.y;
var rect = Clutter.Rect.alloc ();
var clip = rect.init (point_x, point_y, width, height);
rect.init (point_x, point_y, width, height);
var popup_window = new PopupWindow (wm, active, clip);
var popup_window = new PopupWindow (wm, active);
popup_window.set_container_clip (rect);
popup_window.show.connect (on_popup_window_show);
popup_window.hide.connect (on_popup_window_hide);
add_window (popup_window);
@ -112,7 +113,7 @@ public class Gala.Plugins.PIP.Plugin : Gala.Plugin {
private void select_window_at (int x, int y) {
var selected = get_window_actor_at (x, y);
if (selected != null) {
var popup_window = new PopupWindow (wm, selected, null);
var popup_window = new PopupWindow (wm, selected);
popup_window.show.connect (on_popup_window_show);
popup_window.hide.connect (on_popup_window_hide);
add_window (popup_window);

61
plugins/pip/PopupWindow.vala
View File

@ -28,7 +28,8 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
public Gala.WindowManager wm { get; construct; }
public Meta.WindowActor window_actor { get; construct; }
public Clutter.Rect? container_clip { get; construct; }
private bool dynamic_container = false;
private Clutter.Actor clone;
private Clutter.Actor container;
@ -69,8 +70,8 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
Gdk.Display.get_default ().get_device_manager ().get_client_pointer ().get_position (null, out x, out y);
}
public PopupWindow (Gala.WindowManager wm, Meta.WindowActor window_actor, Clutter.Rect? container_clip) {
Object (wm: wm, window_actor: window_actor, container_clip: container_clip);
public PopupWindow (Gala.WindowManager wm, Meta.WindowActor window_actor) {
Object (wm: wm, window_actor: window_actor);
}
construct {
@ -102,17 +103,10 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
container = new Clutter.Actor ();
container.reactive = true;
container.set_scale (0.35f, 0.35f);
container.clip_rect = container_clip;
container.add_effect (new ShadowEffect (SHADOW_SIZE, 2));
container.add_child (clone);
container.add_action (move_action);
if (container_clip == null) {
window_actor.notify["allocation"].connect (on_allocation_changed);
container.set_position (container_margin, container_margin);
update_clone_clip ();
}
update_size ();
update_container_position ();
@ -160,6 +154,10 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
add_child (close_button);
add_child (resize_button);
add_child (resize_handle);
window_actor.notify["allocation"].connect (on_allocation_changed);
container.set_position (container_margin, container_margin);
update_clone_clip ();
}
public override void show () {
@ -206,6 +204,13 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
return true;
}
public void set_container_clip (Clutter.Rect? container_clip) {
container.clip_rect = container_clip;
dynamic_container = true;
update_container_scale ();
on_allocation_changed ();
}
private void on_move_begin () {
int px, py;
get_current_cursor_position (out px, out py);
@ -313,9 +318,11 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
}
private void update_size () {
if (container_clip != null) {
width = (int)(container_clip.get_width () * container.scale_x + button_size);
height = (int)(container_clip.get_height () * container.scale_y + button_size);
if (dynamic_container) {
float src_width = 0.0f, src_height = 0.0f;
container.get_clip (null, null, out src_width, out src_height);
width = (int)(src_width * container.scale_x + button_size);
height = (int)(src_height * container.scale_y + button_size);
} else {
width = (int)(container.width * container.scale_x + button_size);
height = (int)(container.height * container.scale_y + button_size);
@ -334,11 +341,9 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
}
private void update_container_scale () {
float src_width;
float src_height;
if (container_clip != null) {
src_width = container_clip.get_width ();
src_height = container_clip.get_height ();
float src_width = 1.0f, src_height = 1.0f;
if (dynamic_container) {
container.get_clip (null, null, out src_width, out src_height);
} else {
src_width = container.width;
src_height = container.height;
@ -354,7 +359,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
out new_width, out new_height
);
float window_width, window_height;
float window_width = 1.0f, window_height = 1.0f;
get_target_window_size (out window_width, out window_height);
float new_scale_x = new_width / window_width;
@ -367,9 +372,11 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
}
private void update_container_position () {
if (container_clip != null) {
container.x = (float)(-container_clip.get_x () * container.scale_x + container_margin);
container.y = (float)(-container_clip.get_y () * container.scale_y + container_margin);
if (dynamic_container) {
float clip_x = 0.0f, clip_y = 0.0f;
container.get_clip (out clip_x, out clip_y, null, null);
container.x = (float)(-clip_x * container.scale_x + container_margin);
container.y = (float)(-clip_y * container.scale_y + container_margin);
}
}
@ -418,14 +425,10 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
}
private void get_target_window_size (out float width, out float height) {
if (container_clip != null) {
width = container_clip.get_width ();
height = container_clip.get_height ();
if (dynamic_container) {
container.get_clip (null, null, out width, out height);
} else if (clone.has_clip) {
float clone_clip_width = 0.0f, clone_clip_height = 0.0f;
clone.get_clip (null, null, out clone_clip_width, out clone_clip_height);
width = clone_clip_width;
height = clone_clip_height;
clone.get_clip (null, null, out width, out height);
} else {
width = clone.width;
height = clone.height;