lazzexus/Loupe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

general: Use adw alias for libadwaita

Browse source 
This will make writing libadwaita-based code a bit
nicer, and make it nicer when we use crates that
libadwaita's API re-exports.

Also clean up the unused imports exposed by
this change.
This commit is contained in:
Christopher Davis 2021-12-21 12:15:46 -08:00
parent ec0f13d250
commit f9cbad9ad9
5 changed files with 20 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/application.rs
View file

@ -17,14 +17,11 @@
//
// SPDX-License-Identifier: GPL-3.0-or-later
use gio::prelude::*;
use adw::prelude::*;
use adw::subclass::prelude::*;
use glib::clone;
use glib::subclass::prelude::*;
use gtk::prelude::*;
use gtk::subclass::prelude::*;
use gtk_macros::*;
use libadwaita::prelude::*;
use libadwaita::subclass::prelude::*;
use crate::config;
use crate::window::LpWindow;
@ -46,7 +43,7 @@ mod imp {
impl ObjectSubclass for LpApplication {
const NAME: &'static str = "LpApplication";
type Type = super::LpApplication;
type ParentType = libadwaita::Application;
type ParentType = adw::Application;
// Initialize with default values
fn new() -> Self {
@ -64,7 +61,7 @@ mod imp {
// Force dark theme
obj.style_manager()
.set_color_scheme(libadwaita::ColorScheme::PreferDark);
.set_color_scheme(adw::ColorScheme::PreferDark);
// Set up the actions
obj.setup_actions();
@ -100,7 +97,7 @@ mod imp {
// LpApplication without casting.
glib::wrapper! {
pub struct LpApplication(ObjectSubclass<imp::LpApplication>)
@extends gio::Application, gtk::Application, libadwaita::Application,
@extends gio::Application, gtk::Application, adw::Application,
@implements gio::ActionGroup, gio::ActionMap;
}