Skip to content

Commit ea90e2c

Browse files
triggtrigg
authored
Merge branch 'master' into pango_markup
2 parents aea5c7d + cd5d12f commit ea90e2c

98 files changed

Lines changed: 5938 additions & 1761 deletions

Some content is hidden

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

‎.github/workflows/ci.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ jobs:
1212
- run: apk --no-cache add git g++ binutils pkgconf meson ninja musl-dev gtkmm4-dev vala gobject-introspection gobject-introspection-dev pulseaudio-dev pipewire-dev wireplumber-dev libdbusmenu-glib-dev alsa-lib-dev yyjson-dev linux-pam-dev util-linux-login openssl-dev
1313
- run: echo 'http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories
1414
- run: echo 'http://dl-cdn.alpinelinux.org/alpine/edge/main' >> /etc/apk/repositories
15+
- run: echo 'http://dl-cdn.alpinelinux.org/alpine/edge/community' >> /etc/apk/repositories
1516
- run: apk --no-cache add wayland-protocols wayfire-dev gtk4-layer-shell-dev gtk4-layer-shell
1617

1718
- name: wf-shell

‎data/css/default.css‎

Lines changed: 74 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -132,25 +132,33 @@ text-shadow: 1px 1px 0 var(--bcol),
132132
background-color: #00FFAA77;
133133
border: 1px solid #222;
134134
}
135-
.excellent {
135+
.excellent>label {
136136
color: #00ff00;
137137
}
138138

139-
.good {
139+
.good>label
140+
{
140141
color: #88ff00;
141142
}
142143

143-
.ok {
144+
.ok>label
145+
{
144146
color: #ffff00;
145147
}
146148

147-
.weak {
149+
.weak>label
150+
{
148151
color: #ff8800;
149152
}
150153

151-
.none {
154+
.none>label
155+
{
152156
color: #ff0000;
153157
}
158+
.bluetooth>label
159+
{
160+
color: #8888ff;
161+
}
154162

155163
.wf-dock,
156164
.wf-dock .out-box {
@@ -191,7 +199,7 @@ text-shadow: 1px 1px 0 var(--bcol),
191199
-gtk-icon-transform: scale(1.0);
192200
}
193201

194-
.wf-dock image {
202+
.wf-dock image.toplevel-icon {
195203
animation-name: embiggen;
196204
animation-duration: 1000ms;
197205
animation-timing-function: linear;
@@ -206,6 +214,35 @@ text-shadow: 1px 1px 0 var(--bcol),
206214
animation-fill-mode: forwards;
207215
}
208216

217+
.network-control-center image.access-point {
218+
-gtk-icon-size: 40px;
219+
}
220+
221+
.network-control-center .access-point.secure .security {
222+
-gtk-icon-size:20px;
223+
color:red;
224+
}
225+
226+
227+
.network-control-center .access-point.secure.has-password .security {
228+
color:green;
229+
}
230+
231+
.network-control-center .access-point.has-password{
232+
font-weight: bold;
233+
background: #8f83;
234+
}
235+
236+
.network-control-center .vpn.active{
237+
font-weight: bold;
238+
background: #8f83;
239+
}
240+
241+
.network-control-center .access-point .band {
242+
font-size: 1em;
243+
font-weight: bolder;
244+
}
245+
209246
.wf-locker .password{
210247
padding: 10px;
211248
border-radius: 10px;
@@ -220,7 +257,6 @@ text-shadow: 1px 1px 0 var(--bcol),
220257
.wf-locker .fingerprint-overlay-image.info {
221258
color: #88f;
222259
}
223-
224260
.wf-locker .user label {
225261
font-weight: bold;
226262
text-transform: capitalize;
@@ -230,6 +266,7 @@ text-shadow: 1px 1px 0 var(--bcol),
230266
padding-right: 25px;
231267
padding-bottom: 100px;
232268
}
269+
233270
.wf-locker label.weather {
234271
font-weight: bold;
235272
padding-left: 100px;
@@ -241,6 +278,14 @@ text-shadow: 1px 1px 0 var(--bcol),
241278
padding-bottom: 75px;
242279
}
243280

281+
.wf-locker .failure {
282+
animation-name: shake;
283+
animation-duration:0.5s;
284+
animation-timing-function: linear;
285+
animation-iteration-count: 1;
286+
animation-fill-mode: forwards;
287+
}
288+
244289
.wf-locker.sized-480 {
245290
font-size:6px;
246291
}
@@ -292,3 +337,25 @@ text-shadow: 1px 1px 0 var(--bcol),
292337
padding-right: 0rem;
293338
}
294339
}
340+
341+
@keyframes shake {
342+
0% {
343+
transform: translateX(0px);
344+
}
345+
20% {
346+
transform: translateX(20px);
347+
}
348+
40% {
349+
transform: translateX(-20px);
350+
}
351+
60% {
352+
transform: translateX(20px);
353+
}
354+
80% {
355+
transform: translateX(-20px);
356+
}
357+
100% {
358+
transform: translateX(0px);
359+
}
360+
}
361+

‎data/css/panel-wp-mixer-dim-mute.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
.wf-panel .wireplumber-popover .muted {
1+
.wf-panel .wp-mixer-popover .muted {
22
opacity: 0.5;
3-
}
3+
}

‎data/meson.build‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ install_data(join_paths('icons', '256x256', 'wayfire.png'), install_dir: join_pa
1313
install_data(join_paths('icons', '512x512', 'wayfire.png'), install_dir: join_paths(get_option('prefix'), 'share', 'icons', 'hicolor', '512x512', 'apps'))
1414
install_data(join_paths('icons', 'scalable', 'wayfire.svg'), install_dir: join_paths(get_option('prefix'), 'share', 'icons', 'hicolor', 'scalable', 'apps'))
1515

16-
install_data('wf-locker-password', install_dir:'/etc/pam.d/')
16+
install_data('wf-locker', install_dir:'/etc/pam.d/')
1717

18-
subdir('css')
18+
install_data('xdpw/wayfire', install_dir: '/etc/xdg/xdg-desktop-portal-wlr/')
19+
20+
subdir('css')

‎data/wf-locker‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
auth required pam_unix.so nodelay unlock_time=60
2+
account required pam_unix.so nodelay unlock_time=60

‎data/wf-locker-password‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎data/xdpw/wayfire‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[screencast]
2+
chooser_cmd=wf-stream-chooser
3+
chooser_type=simple

‎meson.build‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ add_project_arguments(
6565
language: 'cpp',
6666
)
6767

68-
resource_dir = join_paths(get_option('prefix'), 'share', 'wayfire')
69-
metadata_dir = join_paths(resource_dir, 'metadata', 'wf-shell')
68+
resource_dir = join_paths(get_option('prefix'), 'share', 'wf-shell')
69+
metadata_dir = join_paths(resource_dir, 'metadata')
7070
sysconf_dir = join_paths(get_option('prefix'), get_option('sysconfdir'))
7171

72-
icon_dir = join_paths(get_option('prefix'), 'share', 'wayfire', 'icons')
72+
icon_dir = join_paths(get_option('prefix'), 'share', 'wf-shell', 'icons')
7373
add_project_arguments('-DICONDIR="' + icon_dir + '"', language: 'cpp')
7474
add_project_arguments('-DRESOURCEDIR="' + resource_dir + '"', language: 'cpp')
7575
add_project_arguments('-DMETADATA_DIR="' + metadata_dir + '"', language: 'cpp')

‎metadata/dock.xml‎

Lines changed: 44 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,20 @@
1212
<default>true</default>
1313
</option>
1414
<option name="autohide_duration" type="int">
15-
<_short>Autohide duration</_short>
15+
<_short>Autohide animation duration</_short>
16+
<_long>Time (in milliseconds) the dock takes to show and hide</_long>
1617
<default>300</default>
1718
</option>
19+
<option name="autohide_show_delay" type="int">
20+
<_short>Autohide show delay</_short>
21+
<_long>Amount of time (in milliseconds) the cursor needs to be in the zone before showing.</_long>
22+
<default>300</default>
23+
</option>
24+
<option name="autohide_hide_delay" type="int">
25+
<_short>Autohide hide delay</_short>
26+
<_long>Amount of time (in milliseconds) the cursor needs to be out of the zone before hiding.</_long>
27+
<default>500</default>
28+
</option>
1829
<option name="position" type="string">
1930
<_short>Position</_short>
2031
<default>bottom</default>
@@ -26,23 +37,50 @@
2637
<value>bottom</value>
2738
<_name>Bottom</_name>
2839
</desc>
40+
<desc>
41+
<value>left</value>
42+
<_name>Left</_name>
43+
</desc>
44+
<desc>
45+
<value>right</value>
46+
<_name>Right</_name>
47+
</desc>
2948
</option>
3049
<option name="max_per_line" type="int">
3150
<_short>Max icons per line</_short>
3251
<_long>If greater than 0, the dock will have a maximum number of entries per line, after which a new line is created.</_long>
3352
<default>0</default>
3453
</option>
35-
<option name="dock_height" type="int">
36-
<_short>Dock height</_short>
54+
<option name="full_span" type="bool">
55+
<_short>Anchor to edges</_short>
56+
<_long>Wether the dock should extend all the way to the left and right; or top and bottom depending on orientation.</_long>
57+
<default>false</default>
58+
</option>
59+
<option name="minimal_height" type="int">
60+
<_short>Minimal height</_short>
61+
<default>100</default>
62+
</option>
63+
<option name="minimal_width" type="int">
64+
<_short>Minimal width</_short>
3765
<default>100</default>
3866
</option>
3967
<option name="icon_height" type="int">
4068
<_short>Dock icons height</_short>
4169
<default>72</default>
4270
</option>
43-
<option name="edge_offset" type="int">
44-
<_short>Edge offset</_short>
45-
<_long>The distance from the cursor to the edge of screen to show the panel when it's hidden.</_long>
71+
<option name="edge_margin" type="int">
72+
<_short>Edge margin</_short>
73+
<_long>Space between the dock the edge</_long>
74+
<default>0</default>
75+
</option>
76+
<option name="edge_hotspot_size" type="int">
77+
<_short>Edge hotspot size</_short>
78+
<_long>The distance to the edge of screen to place the cursor in to show the dock when it's hidden.</_long>
79+
<default>20</default>
80+
</option>
81+
<option name="adjacent_edge_hotspot_size" type="int">
82+
<_short>Ajacent edge hotspot size</_short>
83+
<_long>The distance to the edge of adjacent screens to place the cursor in to show the dock when it's hidden.</_long>
4684
<default>20</default>
4785
</option>
4886
<option name="show_close" type="bool">

0 commit comments

Comments
 (0)