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

Fix appicon padding larger than panel on 3.32

Browse Source
This commit is contained in:
Charles Gagnon
2019-03-11 18:11:23 -04:00
parent 1cf4b47e7e
commit 529cc594c0
2 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
appIcons.js
View File

@@ -527,15 +527,9 @@ var taskbarAppIcon = Utils.defineClass({
},
_setAppIconPadding: function() {
let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
let availSize = this.panelWrapper.panel.actor.get_height() - this._dtpSettings.get_int('dot-size') * scaleFactor * 2;
let padding = this._dtpSettings.get_int('appicon-padding');
let padding = getIconPadding(this._dtpSettings);
let margin = this._dtpSettings.get_int('appicon-margin');
if (padding * 2 > availSize) {
padding = (availSize - 1) * .5;
}
this.actor.set_style('padding: 0 ' + margin + 'px;');
this._iconContainer.set_style('padding: ' + padding + 'px;');
},
@@ -1249,6 +1243,18 @@ function cssHexTocssRgba(cssHex, opacity) {
return 'rgba(' + [r, g, b].join(',') + ',' + opacity + ')';
}
function getIconPadding(dtpSettings) {
let panelSize = dtpSettings.get_int('panel-size');
let padding = dtpSettings.get_int('appicon-padding');
let availSize = panelSize - Taskbar.MIN_ICON_SIZE - panelSize % 2;
if (padding * 2 > availSize) {
padding = availSize * .5;
}
return padding;
}
/**
* Extend AppIconMenu
*
@@ -1454,7 +1460,7 @@ function ItemShowLabel() {
*
*/
var ShowAppsIconWrapper = Utils.defineClass({
Name: 'DashToDock.ShowAppsIconWrapper',
Name: 'DashToPanel.ShowAppsIconWrapper',
_init: function(settings) {
this._dtpSettings = settings;
@@ -1518,7 +1524,7 @@ var ShowAppsIconWrapper = Utils.defineClass({
},
setShowAppsPadding: function() {
let padding = this._dtpSettings.get_int('appicon-padding');
let padding = getIconPadding(this._dtpSettings);
let sidePadding = this._dtpSettings.get_int('show-apps-icon-side-padding')
this.actor.set_style('padding:' + padding + 'px ' + (padding + sidePadding) + 'px;');

32
taskbar.js
View File

@@ -53,6 +53,7 @@ var DASH_ANIMATION_TIME = Dash.DASH_ANIMATION_TIME;
let DASH_ITEM_LABEL_SHOW_TIME = Dash.DASH_ITEM_LABEL_SHOW_TIME;
let DASH_ITEM_LABEL_HIDE_TIME = Dash.DASH_ITEM_LABEL_HIDE_TIME;
var DASH_ITEM_HOVER_TIMEOUT = Dash.DASH_ITEM_HOVER_TIMEOUT;
var MIN_ICON_SIZE = 4;
function getPosition() {
let position = St.Side.BOTTOM;
@@ -734,32 +735,26 @@ var taskbar = Utils.defineClass({
},
_adjustIconSize: function() {
// For the icon size, we only consider children which are "proper"
// icons and which are not animating out (which means they will be
// destroyed at the end of the animation)
let iconChildren = this._getTaskbarIcons();
let panelSize = this._dtpSettings.get_int('panel-size');
let availSize = panelSize - this._dtpSettings.get_int('appicon-padding') * 2;
let minIconSize = MIN_ICON_SIZE + panelSize % 2;
iconChildren.push(this._showAppsIcon);
let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
// Getting the panel height and making sure that the icon padding is at
// least the size of the app running indicator on both the top and bottom.
let availSize = (this.panelWrapper.panel.actor.get_height() / scaleFactor) -
(this._dtpSettings.get_int('appicon-padding') * 2);
if (availSize == this.iconSize)
return;
if (availSize < 1) {
availSize = 1;
if (availSize < minIconSize) {
availSize = minIconSize;
}
let oldIconSize = this.iconSize;
// For the icon size, we only consider children which are "proper"
// icons and which are not animating out (which means they will be
// destroyed at the end of the animation)
let iconChildren = this._getTaskbarIcons().concat([this._showAppsIcon]);
let scale = this.iconSize / availSize;
this.iconSize = availSize;
this.emit('icon-size-changed');
let scale = oldIconSize / this.iconSize;
for (let i = 0; i < iconChildren.length; i++) {
let icon = iconChildren[i].child._delegate.icon;
@@ -778,8 +773,7 @@ var taskbar = Utils.defineClass({
// Scale the icon's texture to the previous size and
// tween to the new size
icon.icon.set_size(icon.icon.width * scale,
icon.icon.height * scale);
icon.icon.set_size(icon.icon.width * scale, icon.icon.height * scale);
Tweener.addTween(icon.icon,
{ width: targetWidth,