asriel/l4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Refactor some code

Browse source
This commit is contained in:
Asriel Camora 2023-06-04 12:41:47 -07:00
parent 948428fb04
commit ec4d68f9b5
3 changed files with 17 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -1,2 +1,3 @@
/target
.vscode
.vscode
plugin-store.mp

31
app/src/widgets/app.rs
View file

@ -23,24 +23,23 @@ pub struct AppInner {
}
impl AppInner {
fn register_resources() {
gio::resources_register_include!("Sweet.gresource").expect("Failed to register theme");
gio::resources_register_include!("Sweet-Ambar.gresource")
.expect("Failed to register theme");
gio::resources_register_include!("Sweet-Ambar-Blue.gresource")
.expect("Failed to register theme");
gio::resources_register_include!("Sweet-Dark.gresource").expect("Failed to register theme");
gio::resources_register_include!("Sweet-Mars.gresource").expect("Failed to register theme");
gio::resources_register_include!("FontAwesome.gresource")
.expect("Failed to register theme");
gio::resources_register_include!("L4.gresource").expect("Failed to register app resources");
fn register_resources() -> Result<(), glib::Error> {
gio::resources_register_include!("Sweet.gresource")?;
gio::resources_register_include!("Sweet-Ambar.gresource")?;
gio::resources_register_include!("Sweet-Ambar-Blue.gresource")?;
gio::resources_register_include!("Sweet-Dark.gresource")?;
gio::resources_register_include!("Sweet-Mars.gresource")?;
gio::resources_register_include!("FontAwesome.gresource")?;
gio::resources_register_include!("L4.gresource")?;
Ok(())
}
fn register_icons() {
let display = gdk::Display::default().expect("Could not get a display");
fn register_icons() -> Option<()> {
let display = gdk::Display::default()?;
let icon_theme = IconTheme::for_display(&display);
icon_theme.add_resource_path("/me/workingrobot/l4");
icon_theme.add_resource_path("/com/fontawesome/icons");
Some(())
}
fn register_theme(settings: &gtk::Settings) {
@ -59,13 +58,13 @@ impl ObjectImpl for AppInner {
impl ApplicationImpl for AppInner {
fn startup(&self) {
Self::register_resources();
Self::register_resources().expect("Failed to register resources");
self.parent_startup();
Self::register_icons();
Self::register_icons().expect("Failed to register icons");
let settings = gtk::Settings::default().expect("Could not get default settings");
let settings = gtk::Settings::default().expect("Failed to get default settings");
Self::register_theme(&settings);
let window = AppWindow::new(self.obj().upcast_ref::<gtk::Application>());

11
app/src/widgets/app_window.rs
View file

@ -45,17 +45,6 @@ impl AppWindowData {
}
}
impl Drop for AppWindowData {
fn drop(&mut self) {
// Keeping these alive prior to dropping PluginRegistry means
// Rust will panic/throw (scary, I know) a STATUS_ACCESS_VIOLATION
// This is due to the Weak<> drop implementation trying to
// access unloaded dll memory to decrement its weak count
self.game_store.remove_all();
self.plugin_store.remove_all();
}
}
#[derive(CompositeTemplate, Default)]
#[template(resource = "/me/workingrobot/l4/templates/app_window.ui")]
pub struct AppWindowInner {