isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

st: Move slow-down-factor into settings

Browse Source 
Now that we have a Settings singleton, we have a better place for the
slow-down-factor than an awkward extern variable.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/656
This commit is contained in:
Florian Müllner
2019-07-25 12:50:26 +02:00
committed by Georges Basile Stavracas Neto
parent 5295866eff
commit 12b8fb15b1
8 changed files with 68 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/st/st-theme-node.c
View File

@ -26,6 +26,7 @@
#include <stdlib.h>
#include <string.h>
#include "st-settings.h"
#include "st-theme-private.h"
#include "st-theme-context.h"
#include "st-theme-node-private.h"
@ -39,8 +40,6 @@ static const ClutterColor DEFAULT_SUCCESS_COLOR = { 0x4e, 0x9a, 0x06, 0xff };
static const ClutterColor DEFAULT_WARNING_COLOR = { 0xf5, 0x79, 0x3e, 0xff };
static const ClutterColor DEFAULT_ERROR_COLOR = { 0xcc, 0x00, 0x00, 0xff };
extern gfloat st_slow_down_factor;
G_DEFINE_TYPE (StThemeNode, st_theme_node, G_TYPE_OBJECT)
static void
@ -2348,18 +2347,23 @@ st_theme_node_get_margin (StThemeNode *node,
int
st_theme_node_get_transition_duration (StThemeNode *node)
{
StSettings *settings;
gdouble value = 0.0;
gdouble factor;
g_return_val_if_fail (ST_IS_THEME_NODE (node), 0);
settings = st_settings_get ();
g_object_get (settings, "slow-down-factor", &factor, NULL);
if (node->transition_duration > -1)
return st_slow_down_factor * node->transition_duration;
return factor * node->transition_duration;
st_theme_node_lookup_time (node, "transition-duration", FALSE, &value);
node->transition_duration = (int)value;
return st_slow_down_factor * node->transition_duration;
return factor * node->transition_duration;
}
StIconStyle