[gnome-shell] util: Move wiggle parameters to a common place
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] util: Move wiggle parameters to a common place
- Date: Sat, 1 Feb 2020 07:15:26 +0000 (UTC)
commit 2b184a10d6f19e75d59f7f2b213862d7e324e2bd
Author: Jonas Dreßler <verdre v0yd nl>
Date: Tue Jan 21 10:32:59 2020 +0100
util: Move wiggle parameters to a common place
Since the wiggle effect will be used by the redesigned prompt-dialogs
and we always want to use the same parameters, move those as defaults
for the wiggle function to the util.js file.
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/942
js/gdm/authPrompt.js | 10 +---------
js/misc/util.js | 10 +++++++---
2 files changed, 8 insertions(+), 12 deletions(-)
---
diff --git a/js/gdm/authPrompt.js b/js/gdm/authPrompt.js
index ac42c2c960..4c0f8d23fa 100644
--- a/js/gdm/authPrompt.js
+++ b/js/gdm/authPrompt.js
@@ -17,10 +17,6 @@ var DEFAULT_BUTTON_WELL_ANIMATION_TIME = 300;
var MESSAGE_FADE_OUT_ANIMATION_TIME = 500;
-const WIGGLE_OFFSET = 6;
-const WIGGLE_DURATION = 65;
-const N_WIGGLES = 3;
-
var AuthPromptMode = {
UNLOCK_ONLY: 0,
UNLOCK_OR_LOG_IN: 1,
@@ -282,11 +278,7 @@ var AuthPrompt = GObject.registerClass({
this.setActorInDefaultButtonWell(null);
this.verificationStatus = AuthPromptStatus.VERIFICATION_FAILED;
- Util.wiggle(this._entry, {
- offset: WIGGLE_OFFSET,
- duration: WIGGLE_DURATION,
- wiggleCount: N_WIGGLES,
- });
+ Util.wiggle(this._entry);
}
_onVerificationComplete() {
diff --git a/js/misc/util.js b/js/misc/util.js
index f143c9151e..a58ebc5e81 100644
--- a/js/misc/util.js
+++ b/js/misc/util.js
@@ -11,6 +11,10 @@ const Params = imports.misc.params;
var SCROLL_TIME = 100;
+const WIGGLE_OFFSET = 6;
+const WIGGLE_DURATION = 65;
+const N_WIGGLES = 3;
+
// http://daringfireball.net/2010/07/improved_regex_for_matching_urls
const _balancedParens = '\\([^\\s()<>]+\\)';
const _leadingJunk = '[\\s`(\\[{\'\\"<\u00AB\u201C\u2018]';
@@ -442,9 +446,9 @@ function ensureActorVisibleInScrollView(scrollView, actor) {
function wiggle(actor, params) {
params = Params.parse(params, {
- offset: 0,
- duration: 0,
- wiggleCount: 0,
+ offset: WIGGLE_OFFSET,
+ duration: WIGGLE_DURATION,
+ wiggleCount: N_WIGGLES,
});
actor.translation_x = 0;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]