elementary/gala
1
1
Fork 0
mirror of https://github.com/elementary/gala.git synced 2024-11-27 15:45:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix some issues and codestyle

Browse Source
This commit is contained in:
Rico Tzschichholz 2014-09-30 17:40:41 +02:00
parent d62757998e
commit 8540d25388
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Widgets/WindowOverview.vala
View File

@ -207,8 +207,7 @@ namespace Gala
bool keybinding_filter (KeyBinding binding) bool keybinding_filter (KeyBinding binding)
{ {
var name = binding.get_name (); var name = binding.get_name ();
return name != "expose-windows" return (name != "expose-windows" && name != "expose-all-windows");
&& name != "expose-all-windows";
} }
void restack_windows (Screen screen) void restack_windows (Screen screen)

15
src/WindowManager.vala
View File

@ -451,7 +451,7 @@ namespace Gala
modal_stack.offer_head (proxy); modal_stack.offer_head (proxy);
// modal already active // modal already active
if (modal_stack.size > 2) if (modal_stack.size >= 2)
return proxy; return proxy;
var screen = get_screen (); var screen = get_screen ();
@ -479,7 +479,7 @@ namespace Gala
return; return;
} }
if (modal_stack.size > 0) if (is_modal ())
return; return;
update_input_area (); update_input_area ();
@ -495,7 +495,7 @@ namespace Gala
*/ */
public bool is_modal () public bool is_modal ()
{ {
return modal_stack.size > 0; return (modal_stack.size > 0);
} }
/** /**
@ -503,7 +503,7 @@ namespace Gala
*/ */
public bool modal_proxy_valid (ModalProxy proxy) public bool modal_proxy_valid (ModalProxy proxy)
{ {
return proxy in modal_stack; return (proxy in modal_stack);
} }
public void get_current_cursor_position (out int x, out int y) public void get_current_cursor_position (out int x, out int y)
@ -1238,11 +1238,14 @@ namespace Gala
public override bool keybinding_filter (Meta.KeyBinding binding) public override bool keybinding_filter (Meta.KeyBinding binding)
{ {
if (!is_modal ())
return false;
var modal_proxy = modal_stack.peek_head (); var modal_proxy = modal_stack.peek_head ();
return is_modal () return (modal_proxy != null
&& modal_proxy.keybinding_filter != null && modal_proxy.keybinding_filter != null
&& modal_proxy.keybinding_filter (binding); && modal_proxy.keybinding_filter (binding));
} }
#if HAS_MUTTER310 #if HAS_MUTTER310