Skip to content

Commit edc2f2e

Browse files
committed
Merge main
2 parents 199c286 + 6967a99 commit edc2f2e

File tree

441 files changed

+6313
-2940
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

441 files changed

+6313
-2940
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
image: ghcr.io/elementary/docker:${{ matrix.version }}
2020

2121
steps:
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v5
2323
- name: Install Dependencies
2424
run: |
2525
apt update
@@ -37,6 +37,6 @@ jobs:
3737
image: valalang/lint
3838

3939
steps:
40-
- uses: actions/checkout@v4
40+
- uses: actions/checkout@v5
4141
- name: Lint
4242
run: io.elementary.vala-lint -d .

.github/workflows/merge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010

1111
steps:
1212
- name: Clone repository
13-
uses: actions/checkout@v4
13+
uses: actions/checkout@v5
1414
with:
1515
token: ${{ secrets.GIT_USER_TOKEN }}
1616

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ 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@v4
14-
- uses: elementary/actions/release@master
13+
- uses: actions/checkout@v5
14+
- uses: elementary/actions/release@main
1515
env:
1616
GIT_USER_TOKEN: "${{ secrets.GIT_USER_TOKEN }}"
1717
GIT_USER_NAME: "elementaryBot"

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ A quick app launcher and window switcher for Pantheon
77
You'll need the following dependencies:
88

99
* libadwaita-1-dev
10+
* libgranite-7-dev >= 7.7.0
1011
* libgtk-4-dev
1112
* meson
1213
* valac

data/Application.css

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,27 @@
44
*/
55

66
dock {
7-
background: @bg_color;
8-
border-radius: 9px;
7+
background: alpha(@bg_color, 0.8);
98
box-shadow:
10-
inset 0 -1px 0 0 alpha(@highlight_color, 0.2),
11-
inset 0 1px 0 0 alpha(@highlight_color, 0.3),
12-
inset 1px 0 0 0 alpha(@highlight_color, 0.07),
13-
inset -1px 0 0 0 alpha(@highlight_color, 0.07),
9+
inset 0 -1px 0 0 alpha(@highlight_color, 0.4),
10+
inset 0 1px 0 0 alpha(@highlight_color, 0.6),
11+
inset 1px 0 0 0 alpha(@highlight_color, 0.14),
12+
inset -1px 0 0 0 alpha(@highlight_color, 0.14),
1413
0 0 0 1px @borders,
1514
0 1px 3px alpha(black, 0.2),
1615
0 3px 9px alpha(black, 0.3);
1716
opacity: 0.6;
18-
padding: 9px;
17+
18+
border-radius: 9px;
19+
/* This is required to correctly get border-radius
20+
* If the size on startup is < border-radius * 2, the blur radius will be set incorrectly
21+
*/
22+
min-width: 18px;
23+
min-height: 18px;
1924
}
2025

2126
.reduce-transparency dock {
27+
background: @bg_color;
2228
opacity: 1;
2329
}
2430

@@ -64,13 +70,17 @@ launcher progressbar progress {
6470
min-width: 0;
6571
}
6672

73+
tooltip {
74+
margin-bottom: 0.5em;
75+
}
76+
6777
backgrounditem,
6878
icongroup {
6979
padding: 6px;
7080
padding-bottom: 0;
7181
}
7282

73-
icongroup .icon-group-box {
83+
icongroup .icon-group-bin {
7484
background: alpha(@base_color, 0.4);
7585
box-shadow:
7686
inset 0 -1px 0 0 alpha(@highlight_color, 0.2),
@@ -87,7 +97,7 @@ icongroup .icon-group-box {
8797
box-shadow 200ms cubic-bezier(0.4, 0, 0.2, 1);
8898
}
8999

90-
icongroup.running .icon-group-box {
100+
icongroup.running .icon-group-bin {
91101
background: alpha(@base_color, 0.7);
92102
box-shadow:
93103
inset 0 -1px 0 0 alpha(@highlight_color, 0.2),
@@ -99,7 +109,7 @@ icongroup.running .icon-group-box {
99109
0 3px 2px -1px alpha(@borders, 0.6);
100110
}
101111

102-
.reduce-transparency icongroup .icon-group-box {
112+
.reduce-transparency icongroup bin {
103113
background: @base_color;
104114
}
105115

@@ -131,5 +141,5 @@ backgrounditem .close-button {
131141
}
132142

133143
.running-indicator:disabled {
134-
color: @text_color;
144+
color: @fg_color;
135145
}

data/dock.metainfo.xml.in

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,32 @@
2424
<update_contact>contact_at_elementary.io</update_contact>
2525

2626
<releases>
27+
<release version="8.3.0" date="2025-09-18" urgency="medium">
28+
<description>
29+
<p>Updated translations</p>
30+
</description>
31+
<issues>
32+
<issue url="https://github.com/elementary/dock/issues/259">Dock is sometimes hard to see</issue>
33+
<issue url="https://github.com/elementary/dock/issues/341">Increase actionable area of an app icon all way to the screen edge</issue>
34+
<issue url="https://github.com/elementary/dock/issues/465">Replace dock bubble animation</issue>
35+
</issues>
36+
</release>
37+
38+
<release version="8.2.0" date="2025-09-08" urgency="medium">
39+
<description>
40+
<p>Updated translations</p>
41+
</description>
42+
<issues>
43+
<issue url="https://github.com/elementary/dock/issues/29">Show ToolTips instantly</issue>
44+
<issue url="https://github.com/elementary/dock/issues/99">Show apps icons if apps are running in the background but have no open windows</issue>
45+
<issue url="https://github.com/elementary/dock/issues/324">Show tooltips on top of the dock</issue>
46+
<issue url="https://github.com/elementary/dock/issues/305">Shake app icon when new window can't be opened</issue>
47+
<issue url="https://github.com/elementary/dock/issues/351">When Dock is always visible, change window maximize behavior to place window bottom edge above dock top edge</issue>
48+
<issue url="https://github.com/elementary/dock/issues/422">Dock item tooltips appear behind the dock</issue>
49+
<issue url="https://github.com/elementary/dock/issues/432">Reordering applications in the dock causes them to shake until closed</issue>
50+
</issues>
51+
</release>
52+
2753
<release version="8.1.2" date="2025-06-12" urgency="medium">
2854
<description>
2955
<p>Updated translations</p>

meson.build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
project(
22
'io.elementary.dock',
33
'vala', 'c',
4-
version: '8.1.2',
4+
version: '8.2.0',
55
meson_version: '>=0.58'
66
)
77

@@ -29,7 +29,7 @@ gtk_dep = dependency('gtk4')
2929
gtk_wayland_dep = dependency('gtk4-wayland')
3030
gtk_x11_dep = dependency('gtk4-x11')
3131
x11_dep = dependency('x11')
32-
granite_dep = dependency('granite-7')
32+
granite_dep = dependency('granite-7', version: '>=7.7.0')
3333
adw_dep = dependency('libadwaita-1')
3434
m_dep = cc.find_library('m')
3535
wl_client_dep = dependency('wayland-client')

meson_options.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
option('workspace-switcher', type: 'boolean', value: false, description: 'Add workspace switcher to the dock')
1+
option('workspace-switcher', type: 'boolean', value: true, description: 'Add workspace switcher to the dock')

po/LINGUAS

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ tl
9696
ko
9797
nr
9898
ii
99-
zh_HK
10099
id
101100
frp
102101
kj
@@ -113,7 +112,7 @@ or
113112
id_ID
114113
ku
115114
oc
116-
zh_Hans
115+
zh_CN
117116
co
118117
pa
119118
ckb
@@ -149,7 +148,7 @@ ka
149148
ms
150149
pt
151150
ty
152-
zh_Hant
151+
zh_TW
153152
en_CA
154153
iu
155154
kn
@@ -204,3 +203,6 @@ ca@valencia
204203
en_ZA
205204
pap
206205
sco
206+
zh_HK
207+
zh_HANT
208+
zh_HANS

po/POTFILES

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ src/AppSystem/App.vala
66
src/AppSystem/AppSystem.vala
77
src/AppSystem/Launcher.vala
88
src/AppSystem/PoofPopover.vala
9+
src/AppSystem/Background/BackgroundAppRow.vala
10+
src/AppSystem/Background/BackgroundItem.vala
911
src/DBus/ItemInterface.vala
1012
src/DBus/ShellKeyGrabber.vala
1113
src/DBus/SwitcherooControl.vala

0 commit comments

Comments
 (0)