Skip to content

Commit

Permalink
Format JS, update to 3.38
Browse files Browse the repository at this point in the history
  • Loading branch information
aunetx committed Jan 20, 2021
1 parent 09af6df commit af9d5e0
Show file tree
Hide file tree
Showing 5 changed files with 122 additions and 61 deletions.
24 changes: 15 additions & 9 deletions src/extension.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ var Extension = class Extension {

_onWindowActorAdded(container, metaWindowActor) {
this._windowSignalIds.set(metaWindowActor, [
metaWindowActor.connect('allocation-changed', this._updateTransparent.bind(this)),
metaWindowActor.connect('notify::allocation', this._updateTransparent.bind(this)),
metaWindowActor.connect('notify::visible', this._updateTransparent.bind(this))
]);
}
Expand All @@ -100,10 +100,10 @@ var Extension = class Extension {
const workspaceManager = global.workspace_manager;
const activeWorkspace = workspaceManager.get_active_workspace();
const windows = activeWorkspace.list_windows().filter(metaWindow => {
return metaWindow.is_on_primary_monitor()
&& metaWindow.showing_on_its_workspace()
&& !metaWindow.is_hidden()
&& metaWindow.get_window_type() !== Meta.WindowType.DESKTOP;
return metaWindow.is_on_primary_monitor() &&
metaWindow.showing_on_its_workspace() &&
!metaWindow.is_hidden() &&
metaWindow.get_window_type() !== Meta.WindowType.DESKTOP;
});

// Check if at least one window is near enough to the panel.
Expand Down Expand Up @@ -156,13 +156,19 @@ var Extension = class Extension {
}

_setTextStyle(style) {
Main.panel._leftBox.get_children().forEach((child) => { this._try_set_style(child, style) });
Main.panel._centerBox.get_children().forEach((child) => { this._try_set_style(child, style) });
Main.panel._rightBox.get_children().forEach((child) => { this._try_set_style(child, style) });
Main.panel._leftBox.get_children().forEach((child) => {
this._try_set_style(child, style)
});
Main.panel._centerBox.get_children().forEach((child) => {
this._try_set_style(child, style)
});
Main.panel._rightBox.get_children().forEach((child) => {
this._try_set_style(child, style)
});
}
};

// Called on gnome-shell loading, even if extension is deactivated
function init() {
return new Extension();
}
}
16 changes: 7 additions & 9 deletions src/metadata.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
{
"description": "Permits to change topbar's look and feel when free-floating.\n\nIf you have issues or recommandations, you can tell me on github so I can see them!",
"name": "Smart transparent topbar",
"shell-version": [
"3.32",
"3.34",
"3.36"
],
"url": "https://github.com/aunetx/gnome-shell-extension-transparent-top-bar",
"uuid": "fully-transparent-top-bar@aunetx"
"description": "Permits to change topbar's look and feel when free-floating.\n\nIf you have issues or recommandations, you can tell me on github so I can see them!",
"name": "Smart transparent topbar",
"shell-version": [
"3.38"
],
"url": "https://github.com/aunetx/gnome-shell-extension-transparent-top-bar",
"uuid": "fully-transparent-top-bar@aunetx"
}
7 changes: 3 additions & 4 deletions src/prefs.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ let Extension = imports.misc.extensionUtils.getCurrentExtension();
let Settings = Extension.imports.settings;
let config = new Settings.Prefs();

function init() {
}
function init() {}

function buildPrefsWidget() {
let widget = new PrefsWidget();
Expand All @@ -22,7 +21,7 @@ const PrefsWidget = new GObject.Class({
GTypeName: "PrefsWidget",
Extends: Gtk.ScrolledWindow,

_init: function (params) {
_init: function(params) {
this.parent(params);

let builder = new Gtk.Builder();
Expand Down Expand Up @@ -172,4 +171,4 @@ const PrefsWidget = new GObject.Class({

this.add(builder.get_object('main_frame'));
}
});
});
18 changes: 9 additions & 9 deletions src/prefs.ui
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.2 -->
<interface>
<requires lib="gtk+" version="3.20"/>
<requires lib="gtk+" version="3.20" />
<object class="GtkAdjustment" id="transition_distance_adjustment">
<property name="lower">-1</property>
<property name="upper">15</property>
Expand Down Expand Up @@ -69,7 +69,7 @@
<property name="use_alpha">True</property>
<property name="rgba">rgb(0,0,0)</property>
<property name="show_editor">True</property>
<signal name="color-set" handler="background_active_color_changed" swapped="no"/>
<signal name="color-set" handler="background_active_color_changed" swapped="no" />
</object>
<packing>
<property name="left_attach">1</property>
Expand All @@ -84,7 +84,7 @@
<property name="use_alpha">True</property>
<property name="rgba">rgba(0,0,0,0)</property>
<property name="show_editor">True</property>
<signal name="color-set" handler="background_inactive_color_changed" swapped="no"/>
<signal name="color-set" handler="background_inactive_color_changed" swapped="no" />
</object>
<packing>
<property name="left_attach">1</property>
Expand Down Expand Up @@ -177,7 +177,7 @@
<property name="use_alpha">True</property>
<property name="rgba">rgb(255,255,255)</property>
<property name="show_editor">True</property>
<signal name="color-set" handler="text_active_color_changed" swapped="no"/>
<signal name="color-set" handler="text_active_color_changed" swapped="no" />
</object>
<packing>
<property name="left_attach">1</property>
Expand All @@ -192,7 +192,7 @@
<property name="use_alpha">True</property>
<property name="rgba">rgb(255,255,255)</property>
<property name="show_editor">True</property>
<signal name="color-set" handler="text_inactive_color_changed" swapped="no"/>
<signal name="color-set" handler="text_inactive_color_changed" swapped="no" />
</object>
<packing>
<property name="left_attach">1</property>
Expand All @@ -217,7 +217,7 @@
<property name="halign">start</property>
<property name="valign">start</property>
<property name="active">True</property>
<signal name="state-set" handler="text_default_color_changed" swapped="no"/>
<signal name="state-set" handler="text_default_color_changed" swapped="no" />
</object>
<packing>
<property name="left_attach">1</property>
Expand Down Expand Up @@ -302,7 +302,7 @@
<property name="round_digits">2</property>
<property name="digits">2</property>
<property name="value_pos">right</property>
<signal name="value-changed" handler="transition_duration_changed" swapped="no"/>
<signal name="value-changed" handler="transition_duration_changed" swapped="no" />
</object>
<packing>
<property name="left_attach">1</property>
Expand Down Expand Up @@ -364,7 +364,7 @@
<property name="round_digits">0</property>
<property name="digits">0</property>
<property name="value_pos">right</property>
<signal name="value-changed" handler="transition_distance_changed" swapped="no"/>
<signal name="value-changed" handler="transition_distance_changed" swapped="no" />
</object>
<packing>
<property name="left_attach">1</property>
Expand Down Expand Up @@ -414,7 +414,7 @@
<property name="margin_right">2</property>
<property name="margin_top">2</property>
<property name="margin_bottom">3</property>
<signal name="clicked" handler="reset_all" swapped="no"/>
<signal name="clicked" handler="reset_all" swapped="no" />
</object>
<packing>
<property name="tab_fill">False</property>
Expand Down
118 changes: 88 additions & 30 deletions src/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ function get_local_gsettings(schema_path) {
`Schema ${schema_path} could not be found for extension ${Extension.metadata.uuid}`
);
}
return new Gio.Settings({ settings_schema: schemaObj });
return new Gio.Settings({
settings_schema: schemaObj
});
};

class Prefs {
Expand All @@ -33,64 +35,120 @@ class Prefs {
//! background active color = bg color when topbar touched
this.BACKGROUND_ACTIVE_COLOR = {
key: 'background-active-color',
get: function () { return settings.get_string(this.key); },
set: function (v) { settings.set_string(this.key, v); },
changed: function (cb) { return settings.connect('changed::' + this.key, cb); },
disconnect: function () { return settings.disconnect.apply(settings, arguments); },
get: function() {
return settings.get_string(this.key);
},
set: function(v) {
settings.set_string(this.key, v);
},
changed: function(cb) {
return settings.connect('changed::' + this.key, cb);
},
disconnect: function() {
return settings.disconnect.apply(settings, arguments);
},
};

//! background inactive color = bg color when topbar not touched
this.BACKGROUND_INACTIVE_COLOR = {
key: 'background-inactive-color',
get: function () { return settings.get_string(this.key); },
set: function (v) { settings.set_string(this.key, v); },
changed: function (cb) { return settings.connect('changed::' + this.key, cb); },
disconnect: function () { return settings.disconnect.apply(settings, arguments); },
get: function() {
return settings.get_string(this.key);
},
set: function(v) {
settings.set_string(this.key, v);
},
changed: function(cb) {
return settings.connect('changed::' + this.key, cb);
},
disconnect: function() {
return settings.disconnect.apply(settings, arguments);
},
};

//! text is default color = whether or not to use default colors
this.TEXT_IS_DEFAULT_COLOR = {
key: 'text-is-default-color',
get: function () { return settings.get_boolean(this.key); },
set: function (v) { settings.set_boolean(this.key, v); },
changed: function (cb) { return settings.connect('changed::' + this.key, cb); },
disconnect: function () { return settings.disconnect.apply(settings, arguments); },
get: function() {
return settings.get_boolean(this.key);
},
set: function(v) {
settings.set_boolean(this.key, v);
},
changed: function(cb) {
return settings.connect('changed::' + this.key, cb);
},
disconnect: function() {
return settings.disconnect.apply(settings, arguments);
},
};

//! text active color = text color when topbar touched
this.TEXT_ACTIVE_COLOR = {
key: 'text-active-color',
get: function () { return settings.get_string(this.key); },
set: function (v) { settings.set_string(this.key, v); },
changed: function (cb) { return settings.connect('changed::' + this.key, cb); },
disconnect: function () { return settings.disconnect.apply(settings, arguments); },
get: function() {
return settings.get_string(this.key);
},
set: function(v) {
settings.set_string(this.key, v);
},
changed: function(cb) {
return settings.connect('changed::' + this.key, cb);
},
disconnect: function() {
return settings.disconnect.apply(settings, arguments);
},
};

//! text inactive color = text color when topbar not touched
this.TEXT_INACTIVE_COLOR = {
key: 'text-inactive-color',
get: function () { return settings.get_string(this.key); },
set: function (v) { settings.set_string(this.key, v); },
changed: function (cb) { return settings.connect('changed::' + this.key, cb); },
disconnect: function () { return settings.disconnect.apply(settings, arguments); },
get: function() {
return settings.get_string(this.key);
},
set: function(v) {
settings.set_string(this.key, v);
},
changed: function(cb) {
return settings.connect('changed::' + this.key, cb);
},
disconnect: function() {
return settings.disconnect.apply(settings, arguments);
},
};

//! transition duration = time in second of state transition
this.TRANSITION_DURATION = {
key: 'transition-duration',
get: function () { return settings.get_double(this.key); },
set: function (v) { settings.set_double(this.key, v); },
changed: function (cb) { return settings.connect('changed::' + this.key, cb); },
disconnect: function () { return settings.disconnect.apply(settings, arguments); },
get: function() {
return settings.get_double(this.key);
},
set: function(v) {
settings.set_double(this.key, v);
},
changed: function(cb) {
return settings.connect('changed::' + this.key, cb);
},
disconnect: function() {
return settings.disconnect.apply(settings, arguments);
},
};

//! transition distance = distance in pixels to trigger state change
this.TRANSITION_DISTANCE = {
key: 'transition-distance',
get: function () { return settings.get_int(this.key); },
set: function (v) { settings.set_int(this.key, v); },
changed: function (cb) { return settings.connect('changed::' + this.key, cb); },
disconnect: function () { return settings.disconnect.apply(settings, arguments); },
get: function() {
return settings.get_int(this.key);
},
set: function(v) {
settings.set_int(this.key, v);
},
changed: function(cb) {
return settings.connect('changed::' + this.key, cb);
},
disconnect: function() {
return settings.disconnect.apply(settings, arguments);
},
};
}
};
};

0 comments on commit af9d5e0

Please sign in to comment.