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

Improve hiding/showing of workspaceview

Browse Source
This commit is contained in:
Tom Beckmann 2012-07-14 14:59:58 +02:00
parent 40f15e1487
commit c2d119c544
2 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Main.vala
View File

@ -74,7 +74,7 @@ namespace Gala
}); });
KeyBinding.set_custom_handler ("show-desktop", () => { KeyBinding.set_custom_handler ("show-desktop", () => {
workspace_view.show (); workspace_view.show (false, true);
}); });
KeyBinding.set_custom_handler ("switch-windows", winswitcher.handle_switch_windows); KeyBinding.set_custom_handler ("switch-windows", winswitcher.handle_switch_windows);

39
src/Widgets/WorkspaceView.vala
View File

@ -32,6 +32,10 @@ namespace Gala
bool animating; // delay closing the popup bool animating; // delay closing the popup
uint timeout = 0;
bool wait_one_key_release; //called by shortcut, don't close it on first keyrelease
public WorkspaceView (Gala.Plugin _plugin) public WorkspaceView (Gala.Plugin _plugin)
{ {
plugin = _plugin; plugin = _plugin;
@ -212,7 +216,15 @@ namespace Gala
if (event.keyval == Clutter.Key.Alt_L || if (event.keyval == Clutter.Key.Alt_L ||
event.keyval == Clutter.Key.Super_L || event.keyval == Clutter.Key.Super_L ||
event.keyval == Clutter.Key.Control_L) { event.keyval == Clutter.Key.Control_L) {
if (wait_one_key_release)
return false;
hide (); hide ();
if (timeout != 0) {
Source.remove (timeout);
timeout = 0;
}
return true; return true;
} }
@ -235,16 +247,37 @@ namespace Gala
return false; return false;
} }
public new void show () /*
* if wait, wait one second and look if super is still pressed, if so show
* if shortcut, wait one key release before closing
*/
public new void show (bool wait=false, bool shortcut=false)
{ {
if (visible) if (visible)
return; return;
wait_one_key_release = shortcut;
var screen = plugin.get_screen (); var screen = plugin.get_screen ();
Utils.set_input_area (screen, Utils.InputArea.FULLSCREEN); Utils.set_input_area (screen, Utils.InputArea.FULLSCREEN);
plugin.begin_modal (); plugin.begin_modal ();
visible = true;
grab_key_focus ();
if (wait) {
timeout = Timeout.add (1000, () => {
show_elements ();
timeout = 0;
return false;
});
} else
show_elements ();
}
void show_elements ()
{
var area = screen.get_monitor_geometry (screen.get_primary_monitor ()); var area = screen.get_monitor_geometry (screen.get_primary_monitor ());
y = area.height; y = area.height;
width = area.width; width = area.width;
@ -270,8 +303,6 @@ namespace Gala
return false; return false;
}); //catch hot corner hiding problem and indicator placement }); //catch hot corner hiding problem and indicator placement
visible = true;
grab_key_focus ();
animate (Clutter.AnimationMode.EASE_OUT_QUAD, 250, y : area.height - height, opacity : 255); animate (Clutter.AnimationMode.EASE_OUT_QUAD, 250, y : area.height - height, opacity : 255);
} }
@ -300,7 +331,7 @@ namespace Gala
bool left = (binding.get_name () == "switch-to-workspace-left"); bool left = (binding.get_name () == "switch-to-workspace-left");
switch_to_next_workspace (left); switch_to_next_workspace (left);
show (); show (true);
} }
} }
} }