Skip to content

Commit d76d71e

Browse files
lenemterlenemter
authored
Merge branch 'main' into leolost/panel-window-use-window-positioner
2 parents 83fdc7d + 20a0573 commit d76d71e

File tree

11 files changed

+35
-28
lines changed

11 files changed

+35
-28
lines changed

‎lib/AnimationsSettings.vala‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,11 @@ namespace AnimationsSettings {
2222

2323
return enable_animations;
2424
}
25+
26+
/**
27+
* Utility that returns the given duration or 0 if animations are disabled.
28+
*/
29+
public uint get_animation_duration (uint duration) {
30+
return get_enable_animations () ? duration : 0;
31+
}
2532
}

‎plugins/pip/PopupWindow.vala‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -142,15 +142,15 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
142142
opacity = 0;
143143

144144
save_easing_state ();
145-
set_easing_duration (AnimationsSettings.get_enable_animations () ? 200 : 0);
145+
set_easing_duration (AnimationsSettings.get_animation_duration (200));
146146
opacity = 255;
147147
restore_easing_state ();
148148
}
149149

150150
public override void hide () {
151151
opacity = 255;
152152

153-
var duration = AnimationsSettings.get_enable_animations () ? 200 : 0;
153+
var duration = AnimationsSettings.get_animation_duration (200);
154154
save_easing_state ();
155155
set_easing_duration (duration);
156156
opacity = 0;
@@ -172,7 +172,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
172172
#else
173173
public override bool enter_event (Clutter.CrossingEvent event) {
174174
#endif
175-
var duration = AnimationsSettings.get_enable_animations () ? 300 : 0;
175+
var duration = AnimationsSettings.get_animation_duration (300);
176176

177177
close_button.save_easing_state ();
178178
close_button.set_easing_duration (duration);
@@ -192,7 +192,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
192192
#else
193193
public override bool leave_event (Clutter.CrossingEvent event) {
194194
#endif
195-
var duration = AnimationsSettings.get_enable_animations () ? 300 : 0;
195+
var duration = AnimationsSettings.get_animation_duration (300);
196196

197197
close_button.save_easing_state ();
198198
close_button.set_easing_duration (duration);
@@ -314,7 +314,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
314314
}
315315

316316
private void on_close_click_clicked () {
317-
var duration = AnimationsSettings.get_enable_animations () ? FADE_OUT_TIMEOUT : 0;
317+
var duration = AnimationsSettings.get_animation_duration (FADE_OUT_TIMEOUT);
318318

319319
save_easing_state ();
320320
set_easing_duration (duration);
@@ -448,7 +448,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
448448
var screen_limit_start_y = SCREEN_MARGIN + monitor_y;
449449
var screen_limit_end_y = monitor_height + monitor_y - SCREEN_MARGIN - height;
450450

451-
var duration = AnimationsSettings.get_enable_animations () ? 300 : 0;
451+
var duration = AnimationsSettings.get_animation_duration (300);
452452

453453
save_easing_state ();
454454
set_easing_mode (Clutter.AnimationMode.EASE_OUT_BACK);
@@ -461,7 +461,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
461461
private bool place_window_off_screen () {
462462
off_screen = false;
463463

464-
var duration = AnimationsSettings.get_enable_animations () ? 300 : 0;
464+
var duration = AnimationsSettings.get_animation_duration (300);
465465

466466
save_easing_state ();
467467
set_easing_mode (Clutter.AnimationMode.EASE_OUT_BACK);

‎po/zh_TW.po‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
1010
"POT-Creation-Date: 2024-10-15 19:33+0000\n"
11-
"PO-Revision-Date: 2024-09-19 10:09+0000\n"
11+
"PO-Revision-Date: 2024-11-06 11:20+0000\n"
1212
"Last-Translator: Kisaragi Hiu <[email protected]>\n"
1313
"Language-Team: Chinese (Traditional) <https://l10n.elementary.io/projects/"
1414
"desktop/gala/zh_Hant/>\n"
@@ -151,11 +151,11 @@ msgstr "修正多工作業檢視中手勢可能會停止運作的問題"
151151

152152
#: data/gala.metainfo.xml.in:109
153153
msgid "Improve dynamic workspaces behaviour with multiple monitors"
154-
msgstr "改善多螢幕時的動態工作空間行為"
154+
msgstr "改善多螢幕時的動態工作區行為"
155155

156156
#: data/gala.metainfo.xml.in:131
157157
msgid "Improve handling of move-to-workspace shortcut"
158-
msgstr "改善移動到工作空間快捷鍵的處理"
158+
msgstr "改善「移動到工作區」快捷鍵的處理"
159159

160160
#: data/gala-multitaskingview.desktop.in:4
161161
#: data/gala-multitaskingview.desktop.in:6

‎src/ShellClients/HideTracker.vala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public class Gala.HideTracker : Object {
155155
}
156156

157157
focus_overlap = true;
158-
focus_maximized_overlap = window.get_maximized () == BOTH;
158+
focus_maximized_overlap = VERTICAL in window.get_maximized ();
159159
}
160160

161161
update_hidden ();

‎src/Widgets/IconGroup.vala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ namespace Gala {
165165
if (animate) {
166166
icon.save_easing_state ();
167167
icon.set_easing_mode (Clutter.AnimationMode.LINEAR);
168-
icon.set_easing_duration (AnimationsSettings.get_enable_animations () ? 200 : 0);
168+
icon.set_easing_duration (AnimationsSettings.get_animation_duration (200));
169169
icon.opacity = 0;
170170
icon.restore_easing_state ();
171171

‎src/Widgets/MultitaskingView.vala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -871,7 +871,7 @@ namespace Gala {
871871

872872
dock.save_easing_state ();
873873
dock.set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUAD);
874-
dock.set_easing_duration (AnimationsSettings.get_enable_animations () ? ANIMATION_DURATION : 0);
874+
dock.set_easing_duration (AnimationsSettings.get_animation_duration (ANIMATION_DURATION));
875875
dock.y = target_y;
876876
dock.restore_easing_state ();
877877
};

‎src/Widgets/WindowClone.vala‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class Gala.WindowClone : Clutter.Actor {
4747
public bool active {
4848
set {
4949
active_shape.save_easing_state ();
50-
active_shape.set_easing_duration (AnimationsSettings.get_enable_animations () ? FADE_ANIMATION_DURATION : 0);
50+
active_shape.set_easing_duration (AnimationsSettings.get_animation_duration (FADE_ANIMATION_DURATION));
5151
active_shape.opacity = value ? 255 : 0;
5252
active_shape.restore_easing_state ();
5353
}
@@ -399,7 +399,7 @@ public class Gala.WindowClone : Clutter.Actor {
399399
return;
400400
}
401401

402-
var duration = AnimationsSettings.get_enable_animations () ? MultitaskingView.ANIMATION_DURATION : 0;
402+
var duration = AnimationsSettings.get_animation_duration (MultitaskingView.ANIMATION_DURATION);
403403

404404
save_easing_state ();
405405
set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUAD);
@@ -484,7 +484,7 @@ public class Gala.WindowClone : Clutter.Actor {
484484
return Clutter.EVENT_PROPAGATE;
485485
}
486486

487-
var duration = AnimationsSettings.get_enable_animations () ? FADE_ANIMATION_DURATION : 0;
487+
var duration = AnimationsSettings.get_animation_duration (FADE_ANIMATION_DURATION);
488488

489489
close_button.save_easing_state ();
490490
close_button.set_easing_mode (Clutter.AnimationMode.LINEAR);
@@ -506,7 +506,7 @@ public class Gala.WindowClone : Clutter.Actor {
506506
#else
507507
public override bool leave_event (Clutter.CrossingEvent event) {
508508
#endif
509-
var duration = AnimationsSettings.get_enable_animations () ? FADE_ANIMATION_DURATION : 0;
509+
var duration = AnimationsSettings.get_animation_duration (FADE_ANIMATION_DURATION);
510510

511511
close_button.save_easing_state ();
512512
close_button.set_easing_mode (Clutter.AnimationMode.LINEAR);
@@ -642,7 +642,7 @@ public class Gala.WindowClone : Clutter.Actor {
642642
active_shape.hide ();
643643

644644
var scale = window_icon.width / clone.width;
645-
var duration = AnimationsSettings.get_enable_animations () ? FADE_ANIMATION_DURATION : 0;
645+
var duration = AnimationsSettings.get_animation_duration (FADE_ANIMATION_DURATION);
646646

647647
clone.get_transformed_position (out abs_x, out abs_y);
648648
clone.save_easing_state ();
@@ -700,8 +700,8 @@ public class Gala.WindowClone : Clutter.Actor {
700700

701701
var scale = hovered ? 0.4 : 1.0;
702702
var opacity = hovered ? 0 : 255;
703-
var duration = hovered && insert_thumb != null ? insert_thumb.delay : 100;
704-
duration = AnimationsSettings.get_enable_animations () ? duration : 0;
703+
uint duration = hovered && insert_thumb != null ? insert_thumb.delay : 100;
704+
duration = AnimationsSettings.get_animation_duration (duration);
705705

706706
window_icon.save_easing_state ();
707707

@@ -809,7 +809,7 @@ public class Gala.WindowClone : Clutter.Actor {
809809
get_parent ().remove_child (this);
810810
prev_parent.insert_child_at_index (this, prev_index);
811811

812-
var duration = AnimationsSettings.get_enable_animations () ? MultitaskingView.ANIMATION_DURATION : 0;
812+
var duration = AnimationsSettings.get_animation_duration (MultitaskingView.ANIMATION_DURATION);
813813

814814
clone.set_pivot_point (0.0f, 0.0f);
815815
clone.save_easing_state ();

‎src/Widgets/WindowIconActor.vala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ namespace Gala {
146146

147147
new_icon.save_easing_state ();
148148
new_icon.set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUAD);
149-
new_icon.set_easing_duration (AnimationsSettings.get_enable_animations () ? 500 : 0);
149+
new_icon.set_easing_duration (AnimationsSettings.get_animation_duration (500));
150150
new_icon.restore_easing_state ();
151151

152152
if (icon == null) {

‎src/Widgets/WindowSwitcher/WindowSwitcher.vala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ public class Gala.WindowSwitcher : CanvasActor {
414414
}
415415

416416
save_easing_state ();
417-
set_easing_duration (AnimationsSettings.get_enable_animations () ? ANIMATION_DURATION : 0);
417+
set_easing_duration (AnimationsSettings.get_animation_duration (ANIMATION_DURATION));
418418
opacity = show ? 255 : 0;
419419
restore_easing_state ();
420420
}

‎src/Widgets/WorkspaceClone.vala‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -387,13 +387,13 @@ namespace Gala {
387387

388388
save_easing_state ();
389389
set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUAD);
390-
set_easing_duration (AnimationsSettings.get_enable_animations () ? MultitaskingView.ANIMATION_DURATION : 0);
390+
set_easing_duration (AnimationsSettings.get_animation_duration (MultitaskingView.ANIMATION_DURATION));
391391
set_x (target_x);
392392
restore_easing_state ();
393393

394394
background.save_easing_state ();
395395
background.set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUAD);
396-
background.set_easing_duration (AnimationsSettings.get_enable_animations () ? MultitaskingView.ANIMATION_DURATION : 0);
396+
background.set_easing_duration (AnimationsSettings.get_animation_duration (MultitaskingView.ANIMATION_DURATION));
397397
background.set_scale (scale, scale);
398398
background.restore_easing_state ();
399399
};
@@ -463,13 +463,13 @@ namespace Gala {
463463

464464
save_easing_state ();
465465
set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUAD);
466-
set_easing_duration (AnimationsSettings.get_enable_animations () ? MultitaskingView.ANIMATION_DURATION : 0);
466+
set_easing_duration (AnimationsSettings.get_animation_duration (MultitaskingView.ANIMATION_DURATION));
467467
set_x (target_x);
468468
restore_easing_state ();
469469

470470
background.save_easing_state ();
471471
background.set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUAD);
472-
background.set_easing_duration (AnimationsSettings.get_enable_animations () ? MultitaskingView.ANIMATION_DURATION : 0);
472+
background.set_easing_duration (AnimationsSettings.get_animation_duration (MultitaskingView.ANIMATION_DURATION));
473473
background.set_scale (1, 1);
474474
background.restore_easing_state ();
475475
};

0 commit comments

Comments
 (0)