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

Some minor fixes

Browse Source
This commit is contained in:
Rico Tzschichholz 2012-08-25 09:31:15 +02:00
parent f8ddd6eb36
commit 60de90e4c8
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -48,7 +48,6 @@ ensure_vala_version("0.16.0" MINIMUM)
include(ValaPrecompile) include(ValaPrecompile)
vala_precompile(VALA_C vala_precompile(VALA_C
src/DBus.vala src/DBus.vala
src/WindowOverview.vala
src/Main.vala src/Main.vala
src/Plugin.vala src/Plugin.vala
src/Settings.vala src/Settings.vala
@ -56,6 +55,7 @@ vala_precompile(VALA_C
src/Utils.vala src/Utils.vala
src/Widgets/AppIcon.vala src/Widgets/AppIcon.vala
src/Widgets/ExposedWindow.vala src/Widgets/ExposedWindow.vala
src/Widgets/WindowOverview.vala
src/Widgets/WindowSwitcher.vala src/Widgets/WindowSwitcher.vala
src/Widgets/WorkspaceThumb.vala src/Widgets/WorkspaceThumb.vala
src/Widgets/WorkspaceView.vala src/Widgets/WorkspaceView.vala

2
src/Utils.vala
View File

@ -193,7 +193,7 @@ namespace Gala.Utils
return {rect.x + x, rect.y + y, rect.width, rect.height}; return {rect.x + x, rect.y + y, rect.width, rect.height};
} }
public float point_distance (Point a, Point b) public int squared_distance (Point a, Point b)
{ {
var k1 = b.x - a.x; var k1 = b.x - a.x;
var k2 = b.y - a.y; var k2 = b.y - a.y;

16
src/WindowOverview.vala → src/Widgets/WindowOverview.vala
View File

@ -128,7 +128,7 @@ namespace Gala
taken_slots.resize (rows * columns); taken_slots.resize (rows * columns);
// precalculate all slot centers // precalculate all slot centers
Point[] slot_centers = {}; Utils.Point[] slot_centers = {};
slot_centers.resize (rows * columns); slot_centers.resize (rows * columns);
for (int x = 0; x < columns; x++) { for (int x = 0; x < columns; x++) {
for (int y = 0; y < rows; y++) { for (int y = 0; y < rows; y++) {
@ -149,7 +149,7 @@ namespace Gala
// all slots // all slots
for (int i = 0; i < columns * rows; i++) { for (int i = 0; i < columns * rows; i++) {
var dist = (int)point_distance (pos, slot_centers[i]); var dist = squared_distance (pos, slot_centers[i]);
if (dist < slot_candidate_distance) { if (dist < slot_candidate_distance) {
// window is interested in this slot // window is interested in this slot
@ -157,7 +157,7 @@ namespace Gala
if (occupier == window) if (occupier == window)
continue; continue;
if (occupier == null || dist < point_distance(rect_center (occupier.window.get_outer_rect ()), slot_centers[i])) { if (occupier == null || dist < squared_distance (rect_center (occupier.window.get_outer_rect ()), slot_centers[i])) {
// either nobody lives here, or we're better - takeover the slot if it's our best // either nobody lives here, or we're better - takeover the slot if it's our best
slot_candidate = i; slot_candidate = i;
slot_candidate_distance = dist; slot_candidate_distance = dist;
@ -257,9 +257,9 @@ namespace Gala
overlap = true; overlap = true;
// Determine pushing direction // Determine pushing direction
Point i_center = rect_center (rect); Utils.Point i_center = rect_center (rect);
Point j_center = rect_center (comp); Utils.Point j_center = rect_center (comp);
Point diff = {j_center.x - i_center.x, j_center.y - i_center.y}; Utils.Point diff = {j_center.x - i_center.x, j_center.y - i_center.y};
// Prevent dividing by zero and non-movement // Prevent dividing by zero and non-movement
if (diff.x == 0 && diff.y == 0) if (diff.x == 0 && diff.y == 0)
@ -288,8 +288,8 @@ namespace Gala
// in some situations. We need to do this even when expanding later just in case // in some situations. We need to do this even when expanding later just in case
// all windows are the same size. // all windows are the same size.
// (We are using an old bounding rect for this, hopefully it doesn't matter) // (We are using an old bounding rect for this, hopefully it doesn't matter)
var x_section = (int)Math.roundf ((rects.nth_data (i).x - bounds.x) / (bounds.width / 3.0f)); var x_section = (int)Math.roundf ((rect.x - bounds.x) / (bounds.width / 3.0f));
var y_section = (int)Math.roundf ((rects.nth_data (j).y - bounds.y) / (bounds.height / 3.0f)); var y_section = (int)Math.roundf ((comp.y - bounds.y) / (bounds.height / 3.0f));
i_center = rect_center (rect); i_center = rect_center (rect);
diff.x = 0; diff.x = 0;