[dconf-editor] Move small-keys-list-rows in BrowserStack.
- From: Arnaud B. <arnaudb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dconf-editor] Move small-keys-list-rows in BrowserStack.
- Date: Wed, 19 Dec 2018 17:18:10 +0000 (UTC)
commit d22bbabd32df473a638a67bccd585998c7e27fe0
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date: Thu Nov 29 20:47:55 2018 +0100
Move small-keys-list-rows in BrowserStack.
editor/browser-stack.vala | 39 +++++++++---
editor/browser-view.vala | 2 -
editor/dconf-editor.css | 152 +++++++++++++++++++++++-----------------------
editor/dconf-window.vala | 27 --------
4 files changed, 105 insertions(+), 115 deletions(-)
---
diff --git a/editor/browser-stack.vala b/editor/browser-stack.vala
index a022cab..da76593 100644
--- a/editor/browser-stack.vala
+++ b/editor/browser-stack.vala
@@ -27,15 +27,6 @@ private class BrowserStack : Grid, AdaptativeWidget
internal ViewType current_view { get; private set; default = ViewType.FOLDER; }
- internal bool small_keys_list_rows
- {
- set
- {
- folder_view.small_keys_list_rows = value;
- search_view.small_keys_list_rows = value;
- }
- }
-
private void set_window_size (AdaptativeWidget.WindowSize new_size)
{
folder_view.set_window_size (new_size);
@@ -44,13 +35,41 @@ private class BrowserStack : Grid, AdaptativeWidget
internal ModificationsHandler modifications_handler
{
- set {
+ set
+ {
folder_view.modifications_handler = value;
object_view.modifications_handler = value;
search_view.modifications_handler = value;
}
}
+ construct
+ {
+ StyleContext context = get_style_context ();
+ GLib.Settings settings = new GLib.Settings ("ca.desrt.dconf-editor.Settings");
+ bool has_small_keys_list_rows_class = settings.get_boolean ("small-keys-list-rows");
+
+ ulong small_keys_list_rows_handler = settings.changed ["small-keys-list-rows"].connect ((_settings,
key_name) => {
+ bool small_rows = _settings.get_boolean (key_name);
+ if (small_rows)
+ {
+ if (!has_small_keys_list_rows_class) context.add_class ("small-keys-list-rows");
+ }
+ else if (has_small_keys_list_rows_class) context.remove_class ("small-keys-list-rows");
+ has_small_keys_list_rows_class = small_rows;
+
+ folder_view.small_keys_list_rows = small_rows;
+ search_view.small_keys_list_rows = small_rows;
+ });
+
+ if (has_small_keys_list_rows_class)
+ context.add_class ("small-keys-list-rows");
+ folder_view.small_keys_list_rows = has_small_keys_list_rows_class;
+ search_view.small_keys_list_rows = has_small_keys_list_rows_class;
+
+ destroy.connect (() => settings.disconnect (small_keys_list_rows_handler));
+ }
+
/*\
* * Views
\*/
diff --git a/editor/browser-view.vala b/editor/browser-view.vala
index fc3b046..7272001 100644
--- a/editor/browser-view.vala
+++ b/editor/browser-view.vala
@@ -59,8 +59,6 @@ private class BrowserView : Stack, AdaptativeWidget
private SortingOptions sorting_options;
private GLib.ListStore? key_model = null;
- internal bool small_keys_list_rows { set { current_child.small_keys_list_rows = value; }}
-
private AdaptativeWidget.WindowSize window_size = AdaptativeWidget.WindowSize.START_SIZE;
private void set_window_size (AdaptativeWidget.WindowSize new_size)
{
diff --git a/editor/dconf-editor.css b/editor/dconf-editor.css
index 4f66606..e7a3f2f 100644
--- a/editor/dconf-editor.css
+++ b/editor/dconf-editor.css
@@ -152,82 +152,82 @@
\*/
/* row height */
- .keys-list > row { transition:min-height 0.3s,
- margin-left 0.3s,
margin-right 0.3s,
- padding-left 0.3s,
padding-right 0.3s,
- /* margin 0.3s,
- padding 0.3s, cause
stuttering in the transition */
- border-radius 0.3s; }
- /* .keys-list > row:hover,
- .keys-list > row:selected{ transition:min-height 0.3s,
+ .keys-list > row { transition:min-height 0.3s,
+ margin-left 0.3s,
margin-right 0.3s,
+ padding-left 0.3s,
padding-right 0.3s,
+ /* margin 0.3s,
+ padding 0.3s, cause
stuttering in the transition */
+ border-radius 0.3s; }
+ /* .keys-list > row:hover,
+ .keys-list > row:selected{ transition:min-height 0.3s,
margin 0.3s,
padding 0.3s,
border-radius 0.3s; }
stuttering of a single row is almost bearable */
- .keys-list > .key-row { min-height:4.2em; }
- .keys-list > .f-or-s-row { min-height:2.1em; }
- .keys-list > row { margin:0; padding-top:0.25em;
padding-bottom:0.25em; }
-.large-window .keys-list > row { margin:0.25em; padding-top:0;
padding-bottom:0; }
+ .keys-list > .key-row { min-height:4.2em; }
+ .keys-list > .f-or-s-row { min-height:2.1em; }
+ .keys-list > row { margin:0; padding-top:0.25em;
padding-bottom:0.25em; }
+.large-window .keys-list > row { margin:0.25em; padding-top:0;
padding-bottom:0; }
- .small-keys-list-rows .keys-list > .key-row { min-height:2.5em; }
- .small-keys-list-rows .keys-list > .f-or-s-row { min-height:1.5em; }
- .small-keys-list-rows .keys-list > row { margin:0; padding-top:0;
padding-bottom:0; }
-.large-window.small-keys-list-rows .keys-list > row { margin:0; padding-top:0;
padding-bottom:0; }
+ .small-keys-list-rows .keys-list > .key-row { min-height:2.5em; }
+ .small-keys-list-rows .keys-list > .f-or-s-row { min-height:1.5em; }
+ .small-keys-list-rows .keys-list > row { margin:0; padding-top:0;
padding-bottom:0; }
+.large-window .small-keys-list-rows .keys-list > row { margin:0; padding-top:0;
padding-bottom:0; }
- .hc-theme .keys-list > row { padding-top:0.5em;
padding-bottom:0.5em; }
- .hc-theme.large-window .keys-list > row { padding-top:calc(0.25em + 1px);
padding-bottom:calc(0.25em + 1px); }
- .hc-theme.small-keys-list-rows .keys-list > row { padding-top:0.4em;
padding-bottom:0.4em; }
+ .hc-theme .keys-list > row { padding-top:0.5em;
padding-bottom:0.5em; }
+ .hc-theme.large-window .keys-list > row { padding-top:calc(0.25em + 1px);
padding-bottom:calc(0.25em + 1px); }
+ .hc-theme .small-keys-list-rows .keys-list > row { padding-top:0.4em;
padding-bottom:0.4em; }
/* round borders for large windows */
-.large-window .keys-list > row { border-radius:0.5em;
+.large-window .keys-list > row { border-radius:0.5em;
-gtk-outline-radius:calc(0.5em - 1px);
}
-.large-window.small-keys-list-rows .keys-list > row { border-radius:0;
+.large-window .small-keys-list-rows .keys-list > row { border-radius:0;
-gtk-outline-radius:2px; /* gtk+
defaults */ }
/* visual padding */
- .keys-list:dir(ltr) > row > .key > grid { padding-left: 10px;
padding-right:20px; } /* looks cool */
- .keys-list:dir(rtl) > row > .key > grid { padding-right:10px;
padding-left: 20px; }
+ .keys-list:dir(ltr) > row > .key > grid { padding-left: 10px;
padding-right:20px; } /* cool 8-) */
+ .keys-list:dir(rtl) > row > .key > grid { padding-right:10px;
padding-left: 20px; }
-window:not(.extra-small-window) .keys-list:dir(ltr) > row > .key > grid > :last-child { margin-left:
4em; }
-window:not(.extra-small-window) .keys-list:dir(rtl) > row > .key > grid > :last-child {
margin-right:4em; }
+window:not(.extra-small-window) .keys-list:dir(ltr) > row > .key > grid > :last-child { margin-left:
4em; }
+window:not(.extra-small-window) .keys-list:dir(rtl) > row > .key > grid > :last-child {
margin-right:4em; }
/* technical padding: icon visual padding + icon size + some padding */
- .keys-list > row > .managed > grid { transition:padding-left
0.3s,
- padding-right
0.3s; /* warning: ltr/rtl */ }
+ .keys-list > row > .managed > grid { transition:padding-left
0.3s,
+ padding-right
0.3s; /* warning: ltr/rtl */ }
- .keys-list:dir(ltr) > row > .managed > grid { padding-left: 3rem; }
- .small-keys-list-rows .keys-list:dir(ltr) > row > .managed > grid { padding-left: 2.25rem; }
- .keys-list:dir(rtl) > row > .managed > grid { padding-right: 3rem; }
- .small-keys-list-rows .keys-list:dir(rtl) > row > .manadeg > grid { padding-right: 2.25rem; }
+ .keys-list:dir(ltr) > row > .managed > grid { padding-left: 3rem; }
+ .small-keys-list-rows .keys-list:dir(ltr) > row > .managed > grid { padding-left: 2.25rem; }
+ .keys-list:dir(rtl) > row > .managed > grid { padding-right: 3rem; }
+ .small-keys-list-rows .keys-list:dir(rtl) > row > .manadeg > grid { padding-right: 2.25rem; }
/* grid spacing and padding-end */
- .keys-list:dir(ltr) > row > .managed > grid > label { padding-right:
0.5em; }
- .keys-list:dir(rtl) > row > .managed > grid > label { padding-left:
0.5em; }
+ .keys-list:dir(ltr) > row > .managed > grid > label { padding-right:
0.5em; }
+ .keys-list:dir(rtl) > row > .managed > grid > label { padding-left:
0.5em; }
/* technical labels placing */
- .keys-list > row label.key-name {
transition:min-width 0.3s,
-
font-size 0.3s; }
+ .keys-list > row label.key-name {
transition:min-width 0.3s,
+
font-size 0.3s; }
- .keys-list > row > .managed > grid > label.key-name { min-width:
222px; }
-.large-window .keys-list > row > .managed > grid > label.key-name { min-width:
250px; }
+ .keys-list > row > .managed > grid > label.key-name {
min-width: 222px; }
+.large-window .keys-list > row > .managed > grid > label.key-name {
min-width: 250px; }
/* icons place */
- .keys-list > row > .managed {
background-repeat:no-repeat;
- transition:background-size
0.3s,
-
background-position 0.3s; }
+ .keys-list > row > .managed {
background-repeat:no-repeat;
+
transition:background-size 0.3s,
+
background-position 0.3s; }
- .keys-list > row > .managed { background-size:1.5rem; }
/* ~22px usually */
- .keys-list:dir(ltr) > row > .managed { background-position:
0.75rem center; }
- .keys-list:dir(rtl) > row > .managed {
background-position:calc(100% - 0.75rem) center; }
+ .keys-list > row > .managed { background-size:1.5rem; }
/* ~22px usually */
+ .keys-list:dir(ltr) > row > .managed { background-position:
0.75rem center; }
+ .keys-list:dir(rtl) > row > .managed {
background-position:calc(100% - 0.75rem) center; }
- .keys-list > row > .managed.small { background-size:1.1rem; }
/* ~16px usually, base size */
- .keys-list:dir(ltr) > row > .managed.small { background-position:
0.95rem center; }
- .keys-list:dir(rtl) > row > .managed.small {
background-position:calc(100% - 0.95rem) center; }
+ .keys-list > row > .managed.small { background-size:1.1rem; }
/* ~16px, icons base size */
+ .keys-list:dir(ltr) > row > .managed.small { background-position:
0.95rem center; }
+ .keys-list:dir(rtl) > row > .managed.small {
background-position:calc(100% - 0.95rem) center; }
- .small-keys-list-rows .keys-list > row > .managed { background-size:1.1rem; }
/* ~16px usually, base size */
- .small-keys-list-rows .keys-list:dir(ltr) > row > .managed { background-position:
0.55rem center; }
- .small-keys-list-rows .keys-list:dir(rtl) > row > .managed {
background-position:calc(100% - 0.55rem) center; }
+ .small-keys-list-rows .keys-list > row > .managed { background-size:1.1rem; }
/* ~16px, icons base size */
+ .small-keys-list-rows .keys-list:dir(ltr) > row > .managed { background-position:
0.55rem center; }
+ .small-keys-list-rows .keys-list:dir(rtl) > row > .managed {
background-position:calc(100% - 0.55rem) center; }
/* icon color */
@@ -344,8 +344,8 @@ window:not(.extra-small-window) .keys-list:dir(rtl) > row > .key > grid >
margin-bottom:0.6rem;
}
-.small-keys-list-rows .property-name-label,
-.small-keys-list-rows:not(.extra-small-window) .property-value {
+ .small-keys-list-rows .property-name-label,
+window:not(.extra-small-window) .small-keys-list-rows .property-value {
margin-top :0.3rem;
margin-bottom:0.3rem;
}
@@ -365,31 +365,31 @@ window:not(.extra-small-window) .keys-list:dir(rtl) > row > .key > grid >
:backdrop .property-name-label:disabled,
.extra-small-window:backdrop .property-name-label:disabled { color:@unfocused_insensitive_color; }
- .property-value { margin-left : 1.0rem;
- margin-right : 1.0rem;
- transition:margin-top 0.3s, /* both
*/
- margin-bottom 0.3s, /*
small-keys-list-rows */
- margin-left 0.5s, /*
extra-small-window */
- margin-right 0.5s; /*
extra-small-window */
-
- margin-top : 0.6rem;
- margin-bottom: 0.6rem; }
-
- .extra-small-window .property-value { margin-top : 2.2rem; }
-.small-keys-list-rows.extra-small-window .property-value { margin-top : 1.9rem; }
-
- .property-value:dir(ltr) { margin-left :15.0rem; }
- .property-value:dir(rtl) { margin-right :15.0rem; }
- .extra-small-window .property-value:dir(ltr) { margin-left : 1.0rem; }
- .extra-small-window .property-value:dir(rtl) { margin-right : 1.0rem; }
-
- .properties-list .property-warning { padding-top:0.6rem;
- transition:margin-left 0.3s, /* for ltr */
- margin-right 0.3s; /* for rtl
*/ }
- .properties-list .property-warning:dir(ltr) { margin-left :-7.5rem; }
- .properties-list .property-warning:dir(rtl) { margin-right:-7.5rem; }
-.extra-small-window .properties-list .property-warning:dir(ltr) { margin-left : 0; }
-.extra-small-window .properties-list .property-warning:dir(ltr) { margin-right: 0; }
+ .property-value { margin-left : 1.0rem;
+ margin-right : 1.0rem;
+ transition:margin-top 0.3s, /*
both */
+ margin-bottom 0.3s, /*
small-keys-list-rows */
+ margin-left 0.5s, /*
extra-small-window */
+ margin-right 0.5s; /*
extra-small-window */
+
+ margin-top : 0.6rem;
+ margin-bottom: 0.6rem; }
+
+.extra-small-window .property-value { margin-top : 2.2rem; }
+.extra-small-window .small-keys-list-rows .property-value { margin-top : 1.9rem; }
+
+ .property-value:dir(ltr) { margin-left :15.0rem; }
+ .property-value:dir(rtl) { margin-right :15.0rem; }
+.extra-small-window .property-value:dir(ltr) { margin-left : 1.0rem; }
+.extra-small-window .property-value:dir(rtl) { margin-right : 1.0rem; }
+
+ .properties-list .property-warning { padding-top:0.6rem;
+ transition:margin-left 0.3s, /* for
ltr */
+ margin-right 0.3s; /* for
rtl */ }
+ .properties-list .property-warning:dir(ltr) { margin-left :-7.5rem; }
+ .properties-list .property-warning:dir(rtl) { margin-right:-7.5rem; }
+.extra-small-window .properties-list .property-warning:dir(ltr) { margin-left : 0; }
+.extra-small-window .properties-list .property-warning:dir(ltr) { margin-right: 0; }
.key-editor-child-array {
min-height:10em;
diff --git a/editor/dconf-window.vala b/editor/dconf-window.vala
index 24ad58c..7b9923a 100644
--- a/editor/dconf-window.vala
+++ b/editor/dconf-window.vala
@@ -168,8 +168,6 @@ private class DConfWindow : AdaptativeWindow, AdaptativeWidget
if (!disable_warning && settings.get_boolean ("show-warning"))
show.connect (show_initial_warning);
- set_css_styles ();
-
settings.bind ("mouse-use-extra-buttons", this, "mouse-extra-buttons",
SettingsBindFlags.GET|SettingsBindFlags.NO_SENSITIVITY);
settings.bind ("mouse-back-button", this, "mouse-back-button",
SettingsBindFlags.GET|SettingsBindFlags.NO_SENSITIVITY);
settings.bind ("mouse-forward-button", this, "mouse-forward-button",
SettingsBindFlags.GET|SettingsBindFlags.NO_SENSITIVITY);
@@ -329,30 +327,6 @@ private class DConfWindow : AdaptativeWindow, AdaptativeWidget
revealer.dkey_value_push (full_name, key_value_or_null);
}
- /*\
- * * CSS styles
- \*/
-
- private ulong small_keys_list_rows_handler = 0;
- private bool has_small_keys_list_rows_class = false;
- private void set_css_styles ()
- {
- small_keys_list_rows_handler = settings.changed ["small-keys-list-rows"].connect (() => {
- bool small_rows = settings.get_boolean ("small-keys-list-rows");
- if (small_rows)
- {
- if (!has_small_keys_list_rows_class) context.add_class ("small-keys-list-rows");
- }
- else if (has_small_keys_list_rows_class) context.remove_class ("small-keys-list-rows");
- has_small_keys_list_rows_class = small_rows;
- browser_view.small_keys_list_rows = small_rows;
- });
- has_small_keys_list_rows_class = settings.get_boolean ("small-keys-list-rows");
- if (has_small_keys_list_rows_class)
- context.add_class ("small-keys-list-rows");
- browser_view.small_keys_list_rows = has_small_keys_list_rows_class;
- }
-
/*\
* * Night mode
\*/
@@ -442,7 +416,6 @@ private class DConfWindow : AdaptativeWindow, AdaptativeWidget
settings.disconnect (behaviour_changed_handler);
settings.disconnect (use_shortpaths_changed_handler);
- settings.disconnect (small_keys_list_rows_handler);
settings.delay ();
settings.set_string ("saved-view", saved_view);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
