Misc whitespace clean ups in src (#686)

This commit is contained in:
Daniel Foré 2020-01-09 12:45:00 -08:00 committed by GitHub
parent 7a76ae3028
commit 42701bf833
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 27 additions and 42 deletions

View File

@ -68,4 +68,3 @@ namespace Gala {
}
}
}

View File

@ -115,7 +115,7 @@ namespace Gala {
color_string = settings.get_string ("primary-color");
var color = Clutter.Color.from_string (color_string);
color_string = settings.get_string("secondary-color");
color_string = settings.get_string ("secondary-color");
var second_color = Clutter.Color.from_string (color_string);
var shading_type = settings.get_enum ("color-shading-type");
@ -224,7 +224,7 @@ namespace Gala {
animation = yield BackgroundCache.get_default ().get_animation (filename);
if (animation == null || cancellable.is_cancelled ()) {
set_loaded();
set_loaded ();
return;
}
@ -239,7 +239,7 @@ namespace Gala {
var cache = Meta.BackgroundImageCache.get_default ();
var image = cache.load (File.new_for_path (filename));
if (image.is_loaded ())
set_loaded();
set_loaded ();
else {
ulong handler = 0;
handler = image.loaded.connect (() => {
@ -270,4 +270,3 @@ namespace Gala {
}
}
}

View File

@ -50,7 +50,7 @@ namespace Gala {
var file = File.new_for_path (filename);
try {
var monitor = file.monitor (FileMonitorFlags.NONE, null);
monitor.changed.connect(() => {
monitor.changed.connect (() => {
file_changed (filename);
});

View File

@ -80,5 +80,3 @@ namespace Gala {
}
}
}

View File

@ -177,4 +177,3 @@ namespace Gala {
}
}
}

View File

@ -172,4 +172,3 @@ namespace Gala {
}
}
}

View File

@ -73,7 +73,7 @@ namespace Gala {
var image = cache.load (background_file);
if (image.is_loaded ()) {
image = null;
Idle.add(() => {
Idle.add (() => {
loaded ();
return false;
});
@ -97,4 +97,3 @@ namespace Gala {
}
}
}

View File

@ -219,7 +219,7 @@ namespace Gala {
var k1 = b.x - a.x;
var k2 = b.y - a.y;
return k1*k1 + k2*k2;
return k1 * k1 + k2 * k2;
}
static Meta.Rectangle rect_adjusted (Meta.Rectangle rect, int dx1, int dy1, int dx2, int dy2) {
@ -252,8 +252,10 @@ namespace Gala {
slot_centers.resize (rows * columns);
for (int x = 0; x < columns; x++) {
for (int y = 0; y < rows; y++) {
slot_centers[x + y * columns] = {area.x + slot_width * x + slot_width / 2,
area.y + slot_height * y + slot_height / 2};
slot_centers[x + y * columns] = {
area.x + slot_width * x + slot_width / 2,
area.y + slot_height * y + slot_height / 2
};
}
}

View File

@ -218,4 +218,3 @@ namespace Gala {
}
}
}

View File

@ -38,7 +38,7 @@ namespace Gala {
public TextShadowEffect (int offset_x, int offset_y, uint8 opacity) {
_offset_x = offset_x;
_offset_y = offset_y;
_opacity = opacity;
_opacity = opacity;
}
public override bool pre_paint () {
@ -54,4 +54,3 @@ namespace Gala {
}
}
}

View File

@ -155,4 +155,3 @@ namespace Gala {
}
}
}

View File

@ -66,4 +66,3 @@ namespace Gala {
}
}
}

View File

@ -724,4 +724,3 @@ namespace Gala {
}
}
}

View File

@ -382,4 +382,3 @@ namespace Gala {
}
}
}

View File

@ -184,4 +184,3 @@ namespace Gala {
}
}
}

View File

@ -129,4 +129,3 @@ namespace Gala {
}
}
}

View File

@ -719,7 +719,7 @@ namespace Gala {
var next = active.get_neighbor (direction);
//dont allow empty workspaces to be created by moving, if we have dynamic workspaces
if (Prefs.get_dynamic_workspaces () && Utils.get_n_windows (active) == 1 && next.index () == manager.n_workspaces - 1) {
if (Prefs.get_dynamic_workspaces () && Utils.get_n_windows (active) == 1 && next.index () == manager.n_workspaces - 1) {
Utils.bell (display);
return;
}
@ -1043,7 +1043,7 @@ namespace Gala {
tile_preview.get_size (out width, out height);
if ((tile_rect.width == width && tile_rect.height == height && tile_rect.x == x && tile_rect.y == y)
|| tile_preview.get_transition ("size") != null) {
|| tile_preview.get_transition ("size") != null) {
return;
}
}
@ -1163,8 +1163,7 @@ namespace Gala {
}
// size_changed gets called after frame_rect has updated
public override void size_changed (Meta.WindowActor actor)
{
public override void size_changed (Meta.WindowActor actor) {
if (which_change == null) {
return;
}
@ -1230,9 +1229,9 @@ namespace Gala {
icon.width *= ui_scale;
icon.height *= ui_scale;
float scale_x = (float)icon.width / actor.width;
float scale_y = (float)icon.height / actor.height;
float anchor_x = (float)(actor.x - icon.x) / (icon.width - actor.width);
float scale_x = (float)icon.width / actor.width;
float scale_y = (float)icon.height / actor.height;
float anchor_x = (float)(actor.x - icon.x) / (icon.width - actor.width);
float anchor_y = (float)(actor.y - icon.y) / (icon.height - actor.height);
actor.set_pivot_point (anchor_x, anchor_y);
@ -1857,7 +1856,7 @@ namespace Gala {
var main_container = new Clutter.Actor ();
var static_windows = new Clutter.Actor ();
var in_group = new Clutter.Actor ();
var in_group = new Clutter.Actor ();
var out_group = new Clutter.Actor ();
windows = new List<WindowActor> ();
parents = new List<Clutter.Actor> ();

View File

@ -395,4 +395,3 @@ namespace Gala {
}
}
}