elementary/gala
1
1
Fork 0
mirror of https://github.com/elementary/gala.git synced 2024-12-26 02:33:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

icongroup: Add delay before showing close icon, check condition for showing a close button in central place

Browse Source 
Adding a delay should help preventing accidentally closing a workspace.
Checking the condition whether a close button should be shown in a central place fixes the button
appearing after clicking on the last workspace.
This commit is contained in:
Tom Beckmann 2014-08-11 00:54:33 +02:00
parent 887c564fe4
commit 48c2779b48
1 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/Widgets/IconGroup.vala
View File

@ -202,6 +202,8 @@ namespace Gala
static const int PLUS_SIZE = 8;
static const int PLUS_WIDTH = 24;
const int SHOW_CLOSE_BUTTON_DELAY = 200;
/**
* The group has been clicked. The MultitaskingView should consider activating
* its workspace.
@ -255,6 +257,8 @@ namespace Gala
Actor icon_container;
Cogl.Material dummy_material;
uint show_close_button_timeout = 0;
public IconGroup (Workspace workspace)
{
Object (workspace: workspace);
@ -317,29 +321,47 @@ namespace Gala
public override bool enter_event (CrossingEvent event)
{
// don't display the close button when we don't have dynamic workspaces
// or when there are no windows on us. For one, our method for closing
// wouldn't work anyway without windows and it's also the last workspace
// which we don't want to have closed if everything went correct
if (!Prefs.get_dynamic_workspaces () || icon_container.get_n_children () < 1)
return false;
toggle_close_button (true);
return false;
}
public override bool leave_event (CrossingEvent event)
{
toggle_close_button (false);
if (!contains (event.related))
toggle_close_button (false);
return false;
}
/**
* Requests toggling the close button. If show is true, a timeout will be set after which
* the close button is shown, if false, the close button is hidden and the timeout is removed,
* if it exists. The close button may not be shown even though requested if the workspace has
* no windows or workspaces aren't set to be dynamic.
*
* @param show Whether to show the close button
*/
void toggle_close_button (bool show)
{
// don't display the close button when we don't have dynamic workspaces
// or when there are no windows on us. For one, our method for closing
// wouldn't work anyway without windows and it's also the last workspace
// which we don't want to have closed if everything went correct
if (!Prefs.get_dynamic_workspaces () || icon_container.get_n_children () < 1)
return;
if (show_close_button_timeout != 0) {
Source.remove (show_close_button_timeout);
show_close_button_timeout = 0;
}
if (show) {
close_button.visible = true;
close_button.opacity = 255;
show_close_button_timeout = Timeout.add (SHOW_CLOSE_BUTTON_DELAY, () => {
close_button.visible = true;
close_button.opacity = 255;
show_close_button_timeout = 0;
return false;
});
return;
}