Skip to content

Commit bba5192

Browse files
committed
CssProvider does not support loading multiple resources.
1 parent ff8628b commit bba5192

File tree

5 files changed

+5
-19
lines changed

5 files changed

+5
-19
lines changed

data/resources/resources.gresource.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
<file preprocess="xml-stripblanks" alias="gtk/devicebox.ui">ui/devicebox.ui</file>
1515
<file preprocess="xml-stripblanks" alias="gtk/profilerow.ui">ui/profilerow.ui</file>
1616
<file preprocess="xml-stripblanks" alias="gtk/volumescale.ui">ui/volumescale.ui</file>
17-
<file>ui/levelbar.css</file>
18-
<file>ui/list.css</file>
17+
<file>ui/styling.css</file>
1918
</gresource>
2019
<gresource prefix="/com/saivert/pwvucontrol/icons/scalable/actions">
2120
<file preprocess="xml-stripblanks" alias="com.saivert.pwvucontrol.svg">../icons/com.saivert.pwvucontrol.svg</file>

data/resources/ui/levelbar.css

-13
This file was deleted.

data/resources/ui/list.css renamed to data/resources/ui/styling.css

+1
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33
border: 0px;
44
border-radius: 0px;
55
}
6+

src/main.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
mod config {
2222
#![allow(dead_code)]
2323

24-
include!(concat!(env!("CODEGEN_BUILD_DIR"), "/config.rs"));
24+
include!(concat!(env!("OUT_DIR"), "/config.rs"));
2525
}
2626
mod macros;
2727

@@ -80,8 +80,7 @@ fn main() -> gtk::glib::ExitCode {
8080
gio::resources_register(&resources);
8181

8282
let css = gtk::CssProvider::new();
83-
css.load_from_resource("/com/saivert/pwvucontrol/ui/levelbar.css");
84-
css.load_from_resource("/com/saivert/pwvucontrol/ui/list.css");
83+
css.load_from_resource("/com/saivert/pwvucontrol/ui/styling.css");
8584

8685
gtk::style_context_add_provider_for_display(
8786
&gtk::gdk::Display::default().unwrap(),

src/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ endif
3131

3232
cargo_env = [
3333
'CARGO_HOME=' + meson.project_build_root() / 'cargo-home',
34-
'CODEGEN_BUILD_DIR=' + meson.current_build_dir()
34+
'OUT_DIR=' + meson.current_build_dir()
3535
]
3636

3737
custom_target(

0 commit comments

Comments
 (0)