revert X Property change, and cleanup formatting

This commit is contained in:
Ashley Wulber 2021-12-29 17:31:01 -05:00
parent 5a4a802751
commit 65f43a9300
32 changed files with 459 additions and 429 deletions

View file

@ -1,20 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<template class="DockItem" parent="GtkBox">
<property name="orientation">vertical</property>
<child>
<object class="GtkImage" id="image">
<property name="margin-start">4</property>
<property name="margin-end">4</property>
<property name="margin-top">4</property>
<property name="pixel-size">48</property>
</object>
</child>
<child>
<object class="GtkLabel" id="dots">
<property name="hexpand">true</property>
<property name="halign">center</property>
</object>
</child>
</template>
<template class="DockItem" parent="GtkBox">
<property name="orientation">vertical</property>
<child>
<object class="GtkImage" id="image">
<property name="margin-start">4</property>
<property name="margin-end">4</property>
<property name="margin-top">4</property>
<property name="pixel-size">48</property>
<property name="icon-size">large</property>
</object>
</child>
<child>
<object class="GtkLabel" id="dots">
<property name="hexpand">true</property>
<property name="halign">center</property>
</object>
</child>
</template>
</interface>

View file

@ -1,9 +1,8 @@
use gtk4 as gtk;
use gtk::CompositeTemplate;
use gtk::glib;
use gtk::prelude::*;
use gtk::subclass::prelude::*;
use gtk4 as gtk;
use gtk::CompositeTemplate;
#[derive(Debug, Default, CompositeTemplate)]
#[template(file = "dock_item.ui")]
@ -30,5 +29,7 @@ impl ObjectSubclass for DockItem {
}
impl ObjectImpl for DockItem {}
impl WidgetImpl for DockItem {}
impl BoxImpl for DockItem {}

View file

@ -1,14 +1,14 @@
use crate::utils::BoxedWindowList;
use gio::DesktopAppInfo;
use gio::Icon;
use gtk4 as gtk;
mod imp;
use gtk::glib;
use gtk::prelude::*;
use gtk::subclass::prelude::*;
use crate::dock_object::DockObject;
use crate::utils::BoxedWindowList;
mod imp;
glib::wrapper! {
pub struct DockItem(ObjectSubclass<imp::DockItem>)