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

Clean up select_next_window and avoid more type-checks in favor of casts

Browse Source
This commit is contained in:
Rico Tzschichholz 2014-06-22 23:36:58 +02:00
parent f3a3c848db
commit 287b080288
1 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/Widgets/MultitaskingView/TiledWindowContainer.vala
View File

@ -223,14 +223,12 @@ namespace Gala
continue;
// test for vertical intersection
if (!(window_rect.y + window_rect.height < current_rect.y
|| window_rect.y > current_rect.y + current_rect.height)) {
if (window_rect.y + window_rect.height > current_rect.y
&& window_rect.y < current_rect.y + current_rect.height) {
if (closest != null
&& closest.slot.x < window_rect.x)
closest = window as TiledWindow;
else
closest = window as TiledWindow;
if (closest == null
|| closest.slot.x < window_rect.x)
closest = (TiledWindow) window;
}
break;
case MotionDirection.RIGHT:
@ -238,14 +236,12 @@ namespace Gala
continue;
// test for vertical intersection
if (!(window_rect.y + window_rect.height < current_rect.y
|| window_rect.y > current_rect.y + current_rect.height)) {
if (window_rect.y + window_rect.height > current_rect.y
&& window_rect.y < current_rect.y + current_rect.height) {
if (closest != null
&& closest.slot.x > window_rect.x)
closest = window as TiledWindow;
else
closest = window as TiledWindow;
if (closest == null
|| closest.slot.x > window_rect.x)
closest = (TiledWindow) window;
}
break;
case MotionDirection.UP:
@ -253,14 +249,12 @@ namespace Gala
continue;
// test for horizontal intersection
if (!(window_rect.x + window_rect.width < current_rect.x
|| window_rect.x > current_rect.x + current_rect.width)) {
if (window_rect.x + window_rect.width > current_rect.x
&& window_rect.x < current_rect.x + current_rect.width) {
if (closest != null
&& closest.slot.y > window_rect.y)
closest = window as TiledWindow;
else
closest = window as TiledWindow;
if (closest == null
|| closest.slot.y < window_rect.y)
closest = (TiledWindow) window;
}
break;
case MotionDirection.DOWN:
@ -268,14 +262,12 @@ namespace Gala
continue;
// test for horizontal intersection
if (!(window_rect.x + window_rect.width < current_rect.x
|| window_rect.x > current_rect.x + current_rect.width)) {
if (window_rect.x + window_rect.width > current_rect.x
&& window_rect.x < current_rect.x + current_rect.width) {
if (closest != null
&& closest.slot.y < window_rect.y)
closest = window as TiledWindow;
else
closest = window as TiledWindow;
if (closest == null
|| closest.slot.y > window_rect.y)
closest = (TiledWindow) window;
}
break;
}
@ -300,7 +292,7 @@ namespace Gala
void transition_to_original_state ()
{
foreach (var child in get_children ()) {
var clone = child as TiledWindow;
unowned TiledWindow clone = (TiledWindow) child;
clone.transition_to_original_state ();
}
}