Skip to content

Commit 92ebe74

Browse files
authored
Merge branch 'main' into leolost/greeter
2 parents b8c859b + 13080f3 commit 92ebe74

4 files changed

Lines changed: 12 additions & 8 deletions

File tree

.github/workflows/gettext.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
apt-get install git -y
1818
1919
- name: Clone repository
20-
uses: actions/checkout@v6
20+
uses: actions/checkout@v7
2121
with:
2222
token: ${{ secrets.GIT_USER_TOKEN }}
2323

.github/workflows/main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
image: ghcr.io/elementary/docker:${{ matrix.version }}
2828

2929
steps:
30-
- uses: actions/checkout@v6
30+
- uses: actions/checkout@v7
3131
- name: Install Dependencies
3232
run: |
3333
apt update
@@ -56,7 +56,7 @@ jobs:
5656
image: fedora:latest
5757

5858
steps:
59-
- uses: actions/checkout@v6
59+
- uses: actions/checkout@v7
6060
- name: Install Dependencies
6161
run: |
6262
dnf install -y desktop-file-utils gettext gsettings-desktop-schemas-devel atk-devel clutter-devel libgee-devel glib2-devel gnome-desktop3-devel granite-devel granite-7-devel gtk3-devel gtk4-devel ibus-devel libhandy-devel mutter-devel sqlite-devel meson valac valadoc
@@ -79,7 +79,7 @@ jobs:
7979
zypper addrepo https://download.opensuse.org/repositories/X11:Pantheon/16.0/X11:Pantheon.repo
8080
zypper --gpg-auto-import-keys refresh
8181
zypper --non-interactive install tar git desktop-file-utils gsettings-desktop-schemas-devel libatk-1_0-0 clutter-devel libgee-devel glib2-devel libgnome-desktop-4-devel granite6-devel granite-devel gtk3-devel gtk4-devel ibus-devel libhandy-devel mutter-devel sqlite3-devel meson vala valadoc gcc
82-
- uses: actions/checkout@v6
82+
- uses: actions/checkout@v7
8383
- name: Build
8484
env:
8585
DESTDIR: out
@@ -94,7 +94,7 @@ jobs:
9494
image: valalang/lint
9595

9696
steps:
97-
- uses: actions/checkout@v6
97+
- uses: actions/checkout@v7
9898
- name: Lint
9999
run: |
100100
io.elementary.vala-lint -d daemon

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-22.04
1111
if: github.event.pull_request.merged == true && true == contains(join(github.event.pull_request.labels.*.name), 'Release')
1212
steps:
13-
- uses: actions/checkout@v6
13+
- uses: actions/checkout@v7
1414
- uses: elementary/actions/release@main
1515
env:
1616
GIT_USER_TOKEN: "${{ secrets.GIT_USER_TOKEN }}"

src/ShellClients/HideTracker.vala

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ public class Gala.HideTracker : Object {
6464
});
6565

6666
display.window_created.connect (on_window_created);
67+
display.notify["focus-window"].connect (check_trigger_conditions);
6768

6869
#if HAS_MUTTER49
6970
pan_action = new Clutter.PanGesture () {
@@ -123,15 +124,18 @@ public class Gala.HideTracker : Object {
123124
}
124125

125126
private void check_trigger_conditions () {
126-
if (hovered || has_transients) {
127+
if (hovered || has_transients || panel.window.has_focus ()) {
127128
trigger_show ();
128129
} else {
129130
trigger_hide ();
130131
}
131132
}
132133

133134
private void trigger_hide () {
134-
reset_hide_timeout ();
135+
if (hide_timeout_id != 0) {
136+
/* Hide is already queued */
137+
return;
138+
}
135139

136140
hide_timeout_id = Timeout.add_once (HIDE_DELAY, () => {
137141
hide ();

0 commit comments

Comments
 (0)