refactor launcher removing templates

This commit is contained in:
Ashley Wulber 2021-12-31 14:58:26 -05:00
parent 839a4a55d7
commit 7c0cf048ee
10 changed files with 188 additions and 84 deletions

View file

@ -1,21 +1,15 @@
use gtk4::glib;
use gtk4::prelude::*;
use gtk4::subclass::prelude::*;
use gtk4::CompositeTemplate;
use std::cell::RefCell;
use std::rc::Rc;
#[derive(Debug, Default, CompositeTemplate)]
#[template(file = "application_row.ui")]
#[derive(Debug, Default)]
pub struct SearchResultRow {
#[template_child]
pub name: TemplateChild<gtk4::Label>,
#[template_child]
pub description: TemplateChild<gtk4::Label>,
#[template_child]
pub shortcut: TemplateChild<gtk4::Label>,
#[template_child]
pub image: TemplateChild<gtk4::Image>,
#[template_child]
pub categoryimage: TemplateChild<gtk4::Image>,
pub name: Rc<RefCell<gtk4::Label>>,
pub description: Rc<RefCell<gtk4::Label>>,
pub shortcut: Rc<RefCell<gtk4::Label>>,
pub image: Rc<RefCell<gtk4::Image>>,
pub category_image: Rc<RefCell<gtk4::Image>>,
}
#[glib::object_subclass]
@ -23,14 +17,6 @@ impl ObjectSubclass for SearchResultRow {
const NAME: &'static str = "SearchResultRow";
type Type = super::SearchResultRow;
type ParentType = gtk4::Box;
fn class_init(klass: &mut Self::Class) {
Self::bind_template(klass);
}
fn instance_init(obj: &glib::subclass::InitializingObject<Self>) {
obj.init_template();
}
}
impl ObjectImpl for SearchResultRow {}

View file

@ -1,8 +1,15 @@
use gtk4::glib;
use cascade::cascade;
use glib;
use gtk4::pango::EllipsizeMode;
use gtk4::prelude::*;
use gtk4::subclass::prelude::*;
use gtk4::Align;
use gtk4::Box;
use gtk4::Image;
use gtk4::Label;
use gtk4::Orientation;
use crate::icon_source;
use crate::utils::icon_source;
use crate::BoxedSearchResult;
use crate::SearchResultObject;
@ -10,7 +17,8 @@ mod imp;
glib::wrapper! {
pub struct SearchResultRow(ObjectSubclass<imp::SearchResultRow>)
@extends gtk4::Widget, gtk4::Box;
@extends gtk4::Widget, gtk4::Box,
@implements gtk4::Accessible, gtk4::Buildable, gtk4::ConstraintTarget, gtk4::Orientable;
}
impl Default for SearchResultRow {
@ -21,7 +29,75 @@ impl Default for SearchResultRow {
impl SearchResultRow {
pub fn new() -> Self {
glib::Object::new(&[]).expect("Failed to create SearchResultRow")
let self_ = glib::Object::new(&[]).expect("Failed to create SearchResultRow");
let imp = imp::SearchResultRow::from_instance(&self_);
cascade! {
&self_;
..set_orientation(Orientation::Horizontal);
..set_spacing(12);
..set_margin_start(4);
..set_margin_end(4);
..set_hexpand(true);
};
let category_image = cascade! {
Image::new();
..set_pixel_size(24);
};
self_.append(&category_image);
let image = cascade! {
Image::new();
..set_margin_top(4);
..set_margin_bottom(4);
..set_pixel_size(40);
};
self_.append(&image);
let text_container = cascade! {
Box::new(Orientation::Vertical, 0);
..set_halign(Align::Fill);
..set_hexpand(true);
..set_margin_top(4);
..set_margin_end(4);
..set_margin_bottom(4);
};
self_.append(&text_container);
let shortcut = cascade! {
Label::new(None);
..set_halign(Align::End);
..set_wrap(false);
..add_css_class("body");
};
self_.append(&shortcut);
let name = cascade! {
Label::new(None);
..set_halign(Align::Start);
..set_ellipsize(EllipsizeMode::End);
..set_max_width_chars(40);
..add_css_class("title-4");
};
text_container.append(&name);
let description = cascade! {
Label::new(None);
..set_halign(Align::Start);
..set_ellipsize(EllipsizeMode::End);
..set_max_width_chars(50);
..add_css_class("body");
};
text_container.append(&description);
imp.category_image.replace(category_image);
imp.image.replace(image);
imp.name.replace(name);
imp.description.replace(description);
imp.shortcut.replace(shortcut);
self_
}
pub fn set_search_result(&self, search_obj: SearchResultObject) {
@ -29,10 +105,13 @@ impl SearchResultRow {
if let Ok(search_result) = search_obj.property("data") {
if let Ok(search_result) = search_result.get::<BoxedSearchResult>() {
if let Some(search_result) = search_result.0 {
self_.name.set_text(&search_result.name);
self_.description.set_text(&search_result.description);
self_.name.borrow().set_text(&search_result.name);
self_
.description
.borrow()
.set_text(&search_result.description);
icon_source(&self_.image, &search_result.icon);
icon_source(&self_.categoryimage, &search_result.category_icon);
icon_source(&self_.category_image, &search_result.category_icon);
}
}
}
@ -40,6 +119,9 @@ impl SearchResultRow {
pub fn set_shortcut(&self, indx: u32) {
let self_ = imp::SearchResultRow::from_instance(self);
self_.shortcut.set_text(&format!("Ctrl + {}", indx));
self_
.shortcut
.borrow()
.set_text(&format!("Ctrl + {}", indx));
}
}