elementary/gala
1
1
Fork 0
mirror of https://github.com/elementary/gala.git synced 2024-10-26 16:01:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

pip: Remove deprecated Clutter.DragAction (#968)

Browse Source
This commit is contained in:
David Hewitt 2020-11-16 15:53:06 +00:00 committed by GitHub
parent 991f3f9ac7
commit ebd064f9c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 73 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
plugins/pip/PopupWindow.vala
View File

@ -35,13 +35,15 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
private Clutter.Actor container;
private Clutter.Actor close_button;
private Clutter.Actor resize_button;
private Clutter.Actor resize_handle;
private Clutter.ClickAction close_action;
private Clutter.DragAction resize_action;
private DragDropAction move_action;
private float begin_resize_width = 0.0f;
private float begin_resize_height = 0.0f;
private float resize_start_x = 0.0f;
private float resize_start_y = 0.0f;
private bool resizing = false;
static unowned Meta.Window? previous_focus = null;
@ -126,28 +128,16 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
close_button.set_easing_duration (300);
close_button.add_action (close_action);
resize_action = new Clutter.DragAction ();
resize_action.drag_begin.connect (on_resize_drag_begin);
resize_action.drag_end.connect (on_resize_drag_end);
resize_action.drag_motion.connect (on_resize_drag_motion);
resize_handle = new Clutter.Actor ();
resize_handle.set_size (button_size, button_size);
resize_handle.set_pivot_point (0.5f, 0.5f);
resize_handle.set_position (width - button_size, height - button_size);
resize_handle.reactive = true;
resize_handle.add_action (resize_action);
resize_button = Utils.create_resize_button ();
resize_button.set_pivot_point (0.5f, 0.5f);
resize_button.set_position (width - button_size, height - button_size);
resize_button.opacity = 0;
resize_button.button_press_event.connect (on_resize_button_press);
resize_button.reactive = true;
add_child (container);
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);
@ -217,39 +207,86 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
update_screen_position ();
}
private void on_resize_drag_begin (Clutter.Actor actor, float event_x, float event_y, Clutter.ModifierType type) {
private bool on_resize_button_press (Clutter.ButtonEvent event) {
if (resizing || event.button != 1) {
return false;
}
resizing = true;
get_current_cursor_position (out resize_start_x, out resize_start_y);
begin_resize_width = width;
begin_resize_height = height;
resize_button.get_stage ().set_motion_events_enabled (false);
resize_button.get_stage ().captured_event.connect (on_resize_event);
return true;
}
private void on_resize_drag_end (Clutter.Actor actor, float event_x, float event_y, Clutter.ModifierType type) {
reposition_resize_handle ();
private bool on_resize_event (Clutter.Event event) {
if (!resizing) {
return false;
}
switch (event.get_type ()) {
case Clutter.EventType.MOTION:
var mods = event.get_state ();
if (!(Clutter.ModifierType.BUTTON1_MASK in mods)) {
stop_resizing ();
break;
}
int motion_x, motion_y;
get_current_cursor_position (out motion_x, out motion_y);
float diff_x = motion_x - resize_start_x;
float diff_y = motion_y - resize_start_y;
width = begin_resize_width + diff_x;
height = begin_resize_height + diff_y;
update_container_scale ();
update_size ();
reposition_resize_button ();
break;
case Clutter.EventType.BUTTON_RELEASE:
if (event.get_button () == 1) {
stop_resizing ();
}
break;
case Clutter.EventType.LEAVE:
case Clutter.EventType.ENTER:
return true;
default:
break;
}
return false;
}
private bool stop_resizing () {
if (!resizing) {
return false;
}
resize_button.get_stage ().captured_event.disconnect (on_resize_event);
resize_button.get_stage ().set_motion_events_enabled (true);
resizing = false;
update_screen_position ();
}
private void on_resize_drag_motion (Clutter.Actor actor, float delta_x, float delta_y) {
float press_x, press_y;
resize_action.get_press_coords (out press_x, out press_y);
int motion_x, motion_y;
get_current_cursor_position (out motion_x, out motion_y);
float diff_x = motion_x - press_x;
float diff_y = motion_y - press_y;
width = begin_resize_width + diff_x;
height = begin_resize_height + diff_y;
update_container_scale ();
update_size ();
reposition_resize_button ();
return true;
}
private void on_allocation_changed () {
update_clone_clip ();
update_size ();
reposition_resize_button ();
reposition_resize_handle ();
}
private void on_close_click_clicked () {
@ -378,10 +415,6 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
resize_button.set_position (width - button_size, height - button_size);
}
private void reposition_resize_handle () {
resize_handle.set_position (width - button_size, height - button_size);
}
private void get_current_monitor_rect (out Meta.Rectangle rect) {
#if HAS_MUTTER330
var display = wm.get_display ();