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

Use fixed label widths if possible when apps are ungrouped

Browse Source
This commit is contained in:
Charles Gagnon
2020-05-01 16:46:04 -04:00
parent 1887501081
commit 602f5cf693
2 changed files with 51 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
appIcons.js
View File

@@ -62,6 +62,7 @@ const T6 = 'displayProperIndicatorTimeout';
let LABEL_GAP = 5;
let MAX_INDICATORS = 4;
var DEFAULT_PADDING_SIZE = 4;
var titleRightPadding = -1;
let DOT_STYLE = {
DOTS: "DOTS",
@@ -340,6 +341,10 @@ var taskbarAppIcon = Utils.defineClass({
}
},
updateTitleWidth: function(forceDynamicTitleWidth) {
this._updateWindowTitleStyle(forceDynamicTitleWidth);
},
// Update indicator and target for minimization animation
updateIcon: function() {
@@ -464,17 +469,19 @@ var taskbarAppIcon = Utils.defineClass({
this._displayProperIndicator(true);
},
_updateWindowTitleStyle: function() {
_updateWindowTitleStyle: function(forceDynamicTitleWidth) {
if (this._windowTitle) {
let useFixedWidth = Me.settings.get_boolean('group-apps-use-fixed-width');
let fontWeight = Me.settings.get_string('group-apps-label-font-weight');
let maxLabelWidth = Me.settings.get_int('group-apps-label-max-width') *
St.ThemeContext.get_for_stage(global.stage).scale_factor;
let fontWeight = Me.settings.get_string('group-apps-label-font-weight');
this._windowTitle[(maxLabelWidth > 0 ? 'show' : 'hide')]();
this._windowTitle.clutter_text.natural_width = useFixedWidth ? maxLabelWidth : 0;
this._windowTitle.clutter_text.natural_width_set = useFixedWidth;
this._windowTitle.set_width(!useFixedWidth || forceDynamicTitleWidth ? -1 : maxLabelWidth + this._getWindowTitleRightPadding());
this._windowTitle.set_style('font-size: ' + Me.settings.get_int('group-apps-label-font-size') + 'px;' +
'font-weight: ' + fontWeight + ';' +
(useFixedWidth ? '' : 'max-width: ' + maxLabelWidth + 'px;') +
@@ -482,6 +489,15 @@ var taskbarAppIcon = Utils.defineClass({
}
},
_getWindowTitleRightPadding: function() {
if (this._windowTitle && this._windowTitle.mapped && titleRightPadding < 0) {
//get the right padding defined for .overview-label in stylesheet.css
titleRightPadding = this._windowTitle.get_theme_node().get_padding(St.Side.RIGHT);
}
return titleRightPadding;
},
_updateWindowTitle: function() {
if (this._windowTitle.text != this.window.title) {
this._windowTitle.text = (this.window.title ? this.window.title : this.app.get_name()).replace(/\r?\n|\r/g, '').trim();

45
taskbar.js
View File

@@ -93,7 +93,7 @@ var taskbarActor = Utils.defineClass({
let [, showAppsNatSize] = showAppsButton[Panel.sizeFunc](availFixedSize);
let [, natSize] = this[Panel.sizeFunc](availFixedSize);
let childBox = new Clutter.ActorBox();
let orientation = Panel.getOrientation().toLowerCase();
let orientation = Panel.getOrientation();
childBox[Panel.varCoord.c1] = box[Panel.varCoord.c1];
childBox[Panel.fixedCoord.c1] = box[Panel.fixedCoord.c1];
@@ -106,9 +106,9 @@ var taskbarActor = Utils.defineClass({
childBox[Panel.varCoord.c2] = Math.min(availVarSize, natSize);
scrollview.allocate(childBox, flags);
let [hvalue, , hupper, , , hpageSize] = scrollview[orientation[0] + 'scroll'].adjustment.get_values();
hupper = Math.floor(hupper);
scrollview._dtpFadeSize = hupper > hpageSize ? this._delegate.iconSize : 0;
let [value, , upper, , , pageSize] = scrollview[orientation[0] + 'scroll'].adjustment.get_values();
upper = Math.floor(upper);
scrollview._dtpFadeSize = upper > pageSize ? this._delegate.iconSize : 0;
if (this._currentBackgroundColor !== this._delegate.dtpPanel.dynamicTransparency.currentBackgroundColor) {
this._currentBackgroundColor = this._delegate.dtpPanel.dynamicTransparency.currentBackgroundColor;
@@ -120,10 +120,10 @@ var taskbarActor = Utils.defineClass({
}
childBox[Panel.varCoord.c1] = box[Panel.varCoord.c1] + showAppsNatSize;
childBox[Panel.varCoord.c2] = childBox[Panel.varCoord.c1] + (hvalue > 0 ? scrollview._dtpFadeSize : 0);
childBox[Panel.varCoord.c2] = childBox[Panel.varCoord.c1] + (value > 0 ? scrollview._dtpFadeSize : 0);
leftFade.allocate(childBox, flags);
childBox[Panel.varCoord.c1] = box[Panel.varCoord.c2] - (hvalue + hpageSize < hupper ? scrollview._dtpFadeSize : 0);
childBox[Panel.varCoord.c1] = box[Panel.varCoord.c2] - (value + pageSize < upper ? scrollview._dtpFadeSize : 0);
childBox[Panel.varCoord.c2] = box[Panel.varCoord.c2];
rightFade.allocate(childBox, flags);
},
@@ -217,7 +217,8 @@ var taskbar = Utils.defineClass({
this._container.add_actor(this._showAppsIcon);
this._container.add_actor(this._scrollView);
let fadeStyle = 'background-gradient-direction:' + Panel.getOrientation();
let orientation = Panel.getOrientation();
let fadeStyle = 'background-gradient-direction:' + orientation;
let fade1 = new St.Widget({ style_class: 'scrollview-fade', reactive: false });
let fade2 = new St.Widget({ style_class: 'scrollview-fade',
reactive: false,
@@ -241,11 +242,31 @@ var taskbar = Utils.defineClass({
y_align: St.Align.START, x_align:rtl?St.Align.END:St.Align.START
});
// Update minimization animation target position on allocation of the
// container and on scrollview change.
this._box.connect('notify::allocation', Lang.bind(this, this._updateAppIcons));
let scrollViewAdjustment = this._scrollView.hscroll.adjustment;
scrollViewAdjustment.connect('notify::value', Lang.bind(this, this._updateAppIcons));
let adjustment = this._scrollView[orientation[0] + 'scroll'].adjustment;
let fullScrollView = 0;
adjustment.connect('notify::upper', () => {
// Update minimization animation target position on scrollview change.
this._updateAppIcons();
// When applications are ungrouped and there is some empty space on the horizontal taskbar,
// force a fixed label width to prevent the icons from "wiggling" when an animation runs
// (adding or removing an icon). When the taskbar is full, revert to a dynamic label width
// to allow them to resize and make room for new icons.
if (!isVertical && !this.isGroupApps) {
let initial = fullScrollView;
if (!fullScrollView && Math.floor(adjustment.upper) > adjustment.page_size) {
fullScrollView = adjustment.page_size;
} else if (adjustment.page_size < fullScrollView) {
fullScrollView = 0;
}
if (initial != fullScrollView) {
this._getAppIcons().forEach(a => a.updateTitleWidth(fullScrollView));
}
}
});
this._workId = Main.initializeDeferredWork(this._box, Lang.bind(this, this._redisplay));