Xetibo/ReSet
1
0
Fork 0
mirror of https://github.com/Xetibo/ReSet.git synced 2025-07-26 18:37:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dashie' into ina

Browse source
This commit is contained in:
Dashie 2023-11-12 12:57:08 +01:00 • committed by GitHub
commit 831baee601
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 444 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/components/base/popup.rs
View file

@ -1,17 +1,17 @@
use adw::glib;
use adw::glib::{IsA, Object};
use gtk::Widget;
use adw::glib::Object;
use gtk::{gdk, Editable, Popover};
use super::popupImpl;
glib::wrapper! {
pub struct Popup(ObjectSubclass<popupImpl::Popup>)
@extends adw::Window, gtk::Widget,
@implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget, gtk::Orientable;
@extends Popover, gtk::Widget,
@implements Editable,gdk::Popup, gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget, gtk::Orientable;
}
impl Popup {
pub fn new(child: &impl IsA<Widget>) -> Self {
pub fn new() -> Self {
let popup: Popup = Object::builder().build();
// popup.set_child(child);
popup

36
src/components/base/popupImpl.rs
View file

@ -1,19 +1,41 @@
use std::cell::RefCell;
use std::sync::Arc;
use adw::subclass::prelude::{ActionRowImpl, PreferencesRowImpl};
use adw::subclass::window::AdwWindowImpl;
use gtk::gdk_pixbuf::subclass::prelude::{
PixbufAnimationImpl, PixbufAnimationIterImpl, PixbufLoaderImpl,
};
use gtk::prelude::PopupExt;
use gtk::subclass::prelude::*;
use gtk::{glib, CompositeTemplate};
use gtk::{
gdk, glib, Button, CompositeTemplate, Entry, EntryBuffer, Label, PasswordEntry,
PasswordEntryBuffer, Popover,
};
use super::popup;
#[allow(non_snake_case)]
#[derive(Default, CompositeTemplate)]
#[template(resource = "/org/Xetibo/ReSet/resetPopup.ui")]
pub struct Popup {}
pub struct Popup {
#[template_child]
pub resetPopupLabel: TemplateChild<Label>,
#[template_child]
pub resetPopupEntry: TemplateChild<PasswordEntry>,
#[template_child]
pub resetPopupButton: TemplateChild<Button>,
pub resetPopupText: Arc<RefCell<PasswordEntryBuffer>>,
}
unsafe impl Send for Popup {}
unsafe impl Sync for Popup {}
#[glib::object_subclass]
impl ObjectSubclass for Popup {
const NAME: &'static str = "resetPopup";
type Type = popup::Popup;
type ParentType = adw::Window;
type ParentType = Popover;
fn class_init(klass: &mut Self::Class) {
klass.bind_template();
@ -30,12 +52,12 @@ impl ObjectImpl for Popup {
}
}
impl BoxImpl for Popup {}
impl WidgetImpl for Popup {}
impl AdwWindowImpl for Popup {}
impl WindowImpl for Popup {}
impl PopoverImpl for Popup {}
impl ApplicationWindowImpl for Popup {}
impl EditableImpl for Popup {}