elementary/gala
1
1
Fork 0
mirror of https://github.com/elementary/gala.git synced 2024-12-25 18:24:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

Make input working while being zoomed in

Browse Source
This commit is contained in:
Tom Beckmann 2012-08-08 22:04:15 +02:00
parent 154fd60d1d
commit 511145eaf7
3 changed files with 23 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/org.pantheon.desktop.gala.gschema.xml
View File

@ -71,7 +71,7 @@
<description></description>
</key>
<key type="as" name="zoom-out">
<default><![CDATA[['<Super>minus', 'KP_Subtract']]]></default>
<default><![CDATA[['<Super>minus', '<Super>KP_Subtract']]]></default>
<summary>Zoom out</summary>
<description></description>
</key>

1
src/Plugin.vala
View File

@ -82,7 +82,6 @@ namespace Gala
stage.add_child (workspace_view);
stage.add_child (winswitcher);
stage.add_child (zooming);
/*keybindings*/

84
src/Zooming.vala
View File

@ -21,82 +21,35 @@ using Meta;
namespace Gala
{
public class Zooming : Clutter.Actor
public class Zooming : Object
{
Plugin plugin;
bool active;
uint mouse_poll;
public Zooming (Plugin _plugin)
{
plugin = _plugin;
var stage = Compositor.get_stage_for_screen (plugin.get_screen ());
visible = false;
reactive = true;
add_constraint (new BindConstraint (stage, BindCoordinate.WIDTH, 0));
add_constraint (new BindConstraint (stage, BindCoordinate.HEIGHT, 0));
}
public override bool key_press_event (Clutter.KeyEvent event)
{
switch (event.keyval) {
case Key.Escape:
end ();
return true;
case Key.plus:
case Key.KP_Add:
zoom (true);
return true;
case Key.KP_Subtract:
case Key.minus:
zoom (false);
return true;
}
return false;
}
public override bool button_release_event (ButtonEvent event)
{
end ();
return true;
}
public override void key_focus_out ()
{
end ();
}
public override bool motion_event (Clutter.MotionEvent event)
{
var wins = Compositor.get_window_group_for_screen (plugin.get_screen ());
wins.scale_center_x = event.x * (1 / (float)scale_x);
wins.scale_center_y = event.y * (1 / (float)scale_x);
return true;
active = false;
}
void end ()
{
if (!visible)
if (!active)
return;
visible = false;
active = false;
var wins = Compositor.get_window_group_for_screen (plugin.get_screen ());
wins.animate (AnimationMode.EASE_OUT_CUBIC, 300, scale_x:1.0, scale_y:1.0).completed.connect (() => {
wins.scale_center_x = 0.0f;
wins.scale_center_y = 0.0f;
});
plugin.end_modal ();
plugin.update_input_area ();
Source.remove (mouse_poll);
}
public void zoom (bool in)
@ -104,21 +57,26 @@ namespace Gala
var wins = Compositor.get_window_group_for_screen (plugin.get_screen ());
//setup things
if (in && !visible) {
plugin.begin_modal ();
grab_key_focus ();
if (in && !active) {
int mx, my;
Gdk.Display.get_default ().get_device_manager ().get_client_pointer ().get_position (null, out mx, out my);
wins.scale_center_x = mx;
wins.scale_center_y = my;
visible = true;
get_parent ().set_child_above_sibling (this, null);
Utils.set_input_area (plugin.get_screen (), InputArea.FULLSCREEN);
active = true;
mouse_poll = Timeout.add (50, () => {
float x, y;
Gdk.Display.get_default ().get_device_manager ().get_client_pointer ().get_position (null, out x, out y);
wins.animate (Clutter.AnimationMode.LINEAR, 50, scale_center_x : x);
wins.animate (Clutter.AnimationMode.LINEAR, 50, scale_center_y : y);
return true;
});
}
if (!visible)
if (!active)
return;
var new_val = wins.scale_x - ( in ? -0.5 : 0.5);