Skip to content

Fix: Intelligent Hide Not Working for All Positions #2421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: Intelligent Hide Not Working for All Positions #2421

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 20 additions & 19 deletions docking.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ const {gettext: __} = Extension;

const {signals: Signals} = imports;

const DOCK_DWELL_EDGE_PX = 2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe for another PR, but should we also scale this by the monitor scaling?

const DOCK_DWELL_CHECK_INTERVAL = 100;
const ICON_ANIMATOR_DURATION = 3000;
const STARTUP_ANIMATION_TIME = 500;
Expand Down Expand Up @@ -919,18 +920,18 @@ const DockedDash = GObject.registerClass({
const workArea = Main.layoutManager.getWorkAreaForMonitor(this._monitor.index);
let shouldDwell;
// Check for the correct screen edge, extending the sensitive area to the whole workarea,
// minus 1 px to avoid conflicting with other active corners.
// minus DOCK_DWELL_EDGE_PX to avoid conflicting with other active corners.
if (this._position === St.Side.LEFT) {
shouldDwell = (x === this._monitor.x) && (y > workArea.y) &&
shouldDwell = (x <= this._monitor.x + DOCK_DWELL_EDGE_PX) && (y > workArea.y) &&
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
shouldDwell = (x <= this._monitor.x + DOCK_DWELL_EDGE_PX) && (y > workArea.y) &&
shouldDwell = (x >= this._monitor.x - DOCK_DWELL_EDGE_PX &&
x <= this._monitor.x + DOCK_DWELL_EDGE_PX) && (y > workArea.y) &&

Maybe? And similarly for other cases? As I guess we do not want to break multi-monitor cases

(y < workArea.y + workArea.height);
} else if (this._position === St.Side.RIGHT) {
shouldDwell = (x === this._monitor.x + this._monitor.width - 1) &&
shouldDwell = (x >= this._monitor.x + this._monitor.width - DOCK_DWELL_EDGE_PX) &&
(y > workArea.y) && (y < workArea.y + workArea.height);
} else if (this._position === St.Side.TOP) {
shouldDwell = (y === this._monitor.y) && (x > workArea.x) &&
shouldDwell = (y <= this._monitor.y + DOCK_DWELL_EDGE_PX) && (x > workArea.x) &&
(x < workArea.x + workArea.width);
} else if (this._position === St.Side.BOTTOM) {
shouldDwell = (y === this._monitor.y + this._monitor.height - 1) &&
shouldDwell = (y >= this._monitor.y + this._monitor.height - DOCK_DWELL_EDGE_PX) &&
(x > workArea.x) && (x < workArea.x + workArea.width);
}

Expand Down Expand Up @@ -1117,8 +1118,8 @@ const DockedDash = GObject.registerClass({
}

// Create new barrier
// The barrier extends to the whole workarea, minus 1 px to avoid
// conflicting with other active corners
// The barrier extends to the whole workarea, minus DOCK_DWELL_EDGE_PX
// to avoid conflicting with other active corners
// Note: dash in fixed position doesn't use pressure barrier.
if (this._canUsePressure && this._autohideIsEnabled &&
DockManager.settings.requirePressureToShow) {
Expand All @@ -1127,27 +1128,27 @@ const DockedDash = GObject.registerClass({
this._monitor.index);

if (this._position === St.Side.LEFT) {
x1 = this._monitor.x + 1;
x1 = this._monitor.x + DOCK_DWELL_EDGE_PX;
x2 = x1;
y1 = workArea.y + 1;
y2 = workArea.y + workArea.height - 1;
y1 = workArea.y + DOCK_DWELL_EDGE_PX;
y2 = workArea.y + workArea.height - DOCK_DWELL_EDGE_PX;
direction = Meta.BarrierDirection.POSITIVE_X;
} else if (this._position === St.Side.RIGHT) {
x1 = this._monitor.x + this._monitor.width - 1;
x1 = this._monitor.x + this._monitor.width - DOCK_DWELL_EDGE_PX;
x2 = x1;
y1 = workArea.y + 1;
y2 = workArea.y + workArea.height - 1;
y1 = workArea.y + DOCK_DWELL_EDGE_PX;
y2 = workArea.y + workArea.height - DOCK_DWELL_EDGE_PX;
direction = Meta.BarrierDirection.NEGATIVE_X;
} else if (this._position === St.Side.TOP) {
x1 = workArea.x + 1;
x2 = workArea.x + workArea.width - 1;
y1 = this._monitor.y;
x1 = workArea.x + DOCK_DWELL_EDGE_PX;
x2 = workArea.x + workArea.width - DOCK_DWELL_EDGE_PX;
y1 = this._monitor.y + DOCK_DWELL_EDGE_PX;
y2 = y1;
direction = Meta.BarrierDirection.POSITIVE_Y;
} else if (this._position === St.Side.BOTTOM) {
x1 = workArea.x + 1;
x2 = workArea.x + workArea.width - 1;
y1 = this._monitor.y + this._monitor.height;
x1 = workArea.x + DOCK_DWELL_EDGE_PX;
x2 = workArea.x + workArea.width - DOCK_DWELL_EDGE_PX;
y1 = this._monitor.y + this._monitor.height - DOCK_DWELL_EDGE_PX;
y2 = y1;
direction = Meta.BarrierDirection.NEGATIVE_Y;
}
Expand Down