morgan/dash-to-panel
1
0
Fork 0
mirror of https://github.com/morgan9e/dash-to-panel synced 2026-04-14 00:04:17 +09:00
Code Issues Packages Projects Releases Wiki Activity

resolving merge conflicts

Browse Source
This commit is contained in:
hlechner
2020-08-02 14:00:05 -03:00
parent cfab668d6c
commit 05ae40e97b
1 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
panel.js
View File

@@ -326,7 +326,7 @@ var dtpPanel = Utils.defineClass({
[
Utils.getStageTheme(),
'changed',
() => this._resetGeometry()
() => (this._resetGeometry(), this._setShowDesktopButtonStyle()),
],
[
// sync hover after a popupmenu is closed
@@ -663,17 +663,13 @@ var dtpPanel = Utils.defineClass({
],
[
Me.settings,
'changed::showdesktop-button-width',
() => this._setShowDesktopButtonStyle()
],
[
Me.settings,
'changed::desktop-line-use-custom-color',
() => this._setShowDesktopButtonStyle()
],
[
Me.settings,
'changed::desktop-line-custom-color',
[
'changed::showdesktop-button-width',
'changed::trans-use-custom-bg',
'changed::desktop-line-use-custom-color',
'changed::desktop-line-custom-color',
'changed::trans-bg-color'
],
() => this._setShowDesktopButtonStyle()
],
[
@@ -1267,7 +1263,8 @@ var dtpPanel = Utils.defineClass({
this._showDesktopButton.connect('button-press-event', () => this._onShowDesktopButtonPress());
this._showDesktopButton.connect('enter-event', () => {
this._showDesktopButton.add_style_class_name('showdesktop-button-hovered');
this._showDesktopButton.add_style_class_name(this._getBackgroundBrightness() ?
'showdesktop-button-light-hovered' : 'showdesktop-button-dark-hovered');
if (Me.settings.get_boolean('show-showdesktop-hover')) {
this._timeoutsHandler.add([T4, Me.settings.get_int('show-showdesktop-delay'), () => {
@@ -1278,7 +1275,8 @@ var dtpPanel = Utils.defineClass({
});
this._showDesktopButton.connect('leave-event', () => {
this._showDesktopButton.remove_style_class_name('showdesktop-button-hovered');
this._showDesktopButton.remove_style_class_name(this._getBackgroundBrightness() ?
'showdesktop-button-light-hovered' : 'showdesktop-button-dark-hovered');
if (Me.settings.get_boolean('show-showdesktop-hover')) {
if (this._timeoutsHandler.getId(T4)) {
@@ -1301,21 +1299,28 @@ var dtpPanel = Utils.defineClass({
},
_setShowDesktopButtonStyle: function() {
let rgb = this._getBackgroundBrightness() ? "rgba(55, 55, 55, .2)" : "rgba(200, 200, 200, .2)";
let isLineCustom = Me.settings.get_boolean('desktop-line-use-custom-color');
rgb = isLineCustom ? Me.settings.get_string('desktop-line-custom-color') : rgb;
if (this._showDesktopButton) {
let buttonSize = Me.settings.get_int('showdesktop-button-width') + 'px;';
let isVertical = this.checkIfVertical();
let lineRgbaColor = Me.settings.get_string('desktop-line-custom-color');
let isLineCustom = Me.settings.get_boolean('desktop-line-use-custom-color');
let sytle = isLineCustom ? 'border:0 solid ' + lineRgbaColor + ';' : '';
let sytle = "border: 0 solid " + rgb + ";";
sytle += isVertical ? 'border-top-width:1px;height:' + buttonSize : 'border-left-width:1px;width:' + buttonSize;
this._showDesktopButton.set_style(sytle);
this._showDesktopButton[(isVertical ? 'x' : 'y') + '_expand'] = true;
}
},
// _getBackgroundBrightness: return true if panel has a bright background color
_getBackgroundBrightness: function() {
return Utils.checkIfColorIsBright(this.dynamicTransparency.backgroundColorRgb);
},
_toggleWorkspaceWindows: function(hide, workspace) {
let tweenOpts = {
opacity: hide ? 0 : 255,