Skip to content

Commit ad9c288

Browse files
authored
Bump to Granite 7 (#225)
1 parent 4044607 commit ad9c288

4 files changed

Lines changed: 11 additions & 11 deletions

File tree

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Install Dependencies
2626
run: |
2727
apt update
28-
apt install -y libaccountsservice-dev libdbus-1-dev libgranite-dev libgeoclue-2-dev libfwupd-dev libpackagekit-glib2-dev libgdk-pixbuf-2.0-dev libgexiv2-dev meson systemd-dev valac
28+
apt install -y libaccountsservice-dev libdbus-1-dev libgranite-7-dev libgeoclue-2-dev libfwupd-dev libpackagekit-glib2-dev libgdk-pixbuf-2.0-dev libgexiv2-dev meson systemd-dev valac
2929
- name: Build
3030
env:
3131
DESTDIR: out

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ You'll need the following dependencies:
1313
* libgdk-pixbuf2.0-dev
1414
* libgeoclue-2-dev
1515
* libgexiv2-dev
16-
* libgranite-dev
16+
* libgranite-7-dev
1717
* libpackagekit-glib2-dev
1818
* meson
1919
* valac

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ gnome = import('gnome')
1010
fwupd_dep = dependency('fwupd')
1111
gio_dep = dependency ('gio-2.0')
1212
glib_dep = dependency('glib-2.0')
13-
granite_dep = dependency('granite', version: '>= 5.3.0')
13+
granite_dep = dependency('granite-7', version: '>= 7.0.0')
1414
gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0')
1515
gexiv2_dep = dependency('gexiv2')
1616
pk_dep = dependency('packagekit-glib2')

src/Backends/AccentColorManager.vala

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ public class SettingsDaemon.Backends.AccentColorManager : Object {
2424

2525
private static inline Gdk.RGBA rgba_from_int (int color) {
2626
return {
27-
((color >> 16) & 255) / 255.0,
28-
((color >> 8) & 255) / 255.0,
29-
(color & 255) / 255.0,
30-
0.0
27+
((color >> 16) & 255) / 255.0f,
28+
((color >> 8) & 255) / 255.0f,
29+
(color & 255) / 255.0f,
30+
0.0f
3131
};
3232
}
3333

@@ -177,10 +177,10 @@ public class SettingsDaemon.Backends.AccentColorManager : Object {
177177
for (var i = 0; i < raw_pixels.length / factor; i += step_size) {
178178
var offset = i * factor;
179179
pixels.append_val ({
180-
raw_pixels[offset] / 255.0,
181-
raw_pixels[offset + 1] / 255.0,
182-
raw_pixels[offset + 2] / 255.0,
183-
0.0
180+
raw_pixels[offset] / 255.0f,
181+
raw_pixels[offset + 1] / 255.0f,
182+
raw_pixels[offset + 2] / 255.0f,
183+
0.0f
184184
});
185185
}
186186

0 commit comments

Comments
 (0)