mirror of
https://github.com/Xetibo/ReSet.git
synced 2025-11-04 01:35:20 +01:00
chore: Use less margin
This commit is contained in:
parent
c4af8696a8
commit
64a5a67e29
9 changed files with 47 additions and 77 deletions
|
|
@ -8,14 +8,14 @@ use adw::subclass::prelude::ObjectSubclassIsExt;
|
|||
use adw::{glib, ActionRow};
|
||||
use dbus::blocking::Connection;
|
||||
use dbus::{Error, Path};
|
||||
use gtk::prelude::{ButtonExt, WidgetExt};
|
||||
use gtk::prelude::{ButtonExt, ListBoxRowExt, WidgetExt};
|
||||
use gtk::{gio, GestureClick};
|
||||
use re_set_lib::bluetooth::bluetooth_structures::BluetoothDevice;
|
||||
|
||||
glib::wrapper! {
|
||||
pub struct BluetoothEntry(ObjectSubclass<bluetooth_entry_impl::BluetoothEntry>)
|
||||
@extends ActionRow, gtk::Widget,
|
||||
@implements gtk::Accessible, gtk::Buildable, gtk::Actionable, gtk::ConstraintTarget;
|
||||
@implements gtk::Accessible, gtk::Buildable, gtk::Actionable, gtk::ConstraintTarget, gtk::ListBoxRow;
|
||||
}
|
||||
|
||||
unsafe impl Send for BluetoothEntry {}
|
||||
|
|
@ -24,13 +24,13 @@ unsafe impl Sync for BluetoothEntry {}
|
|||
impl BluetoothEntry {
|
||||
pub fn new(device: &BluetoothDevice) -> Self {
|
||||
let entry: BluetoothEntry = Object::builder().build();
|
||||
entry.set_sensitive(true);
|
||||
let entry_imp = entry.imp();
|
||||
entry_imp
|
||||
.reset_bluetooth_label
|
||||
.get()
|
||||
.set_text(&device.alias);
|
||||
entry.set_subtitle(&device.address);
|
||||
entry.set_activatable(true);
|
||||
if device.icon.is_empty() {
|
||||
entry_imp
|
||||
.reset_bluetooth_device_type
|
||||
|
|
@ -40,7 +40,7 @@ impl BluetoothEntry {
|
|||
.reset_bluetooth_device_type
|
||||
.set_icon_name(Some(&device.icon));
|
||||
}
|
||||
if device.paired {
|
||||
if device.connected || device.paired {
|
||||
entry_imp.reset_bluetooth_button.set_sensitive(true);
|
||||
} else {
|
||||
entry_imp.reset_bluetooth_button.set_sensitive(false);
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ impl ReSetWindow {
|
|||
let self_imp = self.imp();
|
||||
self_imp
|
||||
.reset_sidebar_breakpoint
|
||||
.set_condition(BreakpointCondition::parse("max-width: 950sp").as_ref().ok());
|
||||
.set_condition(BreakpointCondition::parse("max-width: 860sp").as_ref().ok());
|
||||
self_imp.reset_sidebar_breakpoint.add_setter(
|
||||
&Object::from(self_imp.reset_overlay_split_view.get()),
|
||||
"collapsed",
|
||||
|
|
|
|||
|
|
@ -77,19 +77,19 @@ impl ObjectImpl for ReSetWindow {
|
|||
|
||||
impl WidgetImpl for ReSetWindow {
|
||||
fn size_allocate(&self, width: i32, height: i32, baseline: i32) {
|
||||
// felixusan, use "the force" for debugging
|
||||
// aka this variable
|
||||
// println!("{width}");
|
||||
self.parent_size_allocate(width, height, baseline);
|
||||
if width > 738 {
|
||||
self.reset_main.set_margin_start(100);
|
||||
self.reset_main.set_margin_end(100);
|
||||
} else if width > 600 {
|
||||
self.reset_main.set_margin_start((width - 600) / 2);
|
||||
self.reset_main.set_margin_end((width - 600) / 2);
|
||||
if width > 658 {
|
||||
self.reset_main.set_margin_start(60);
|
||||
self.reset_main.set_margin_end(60);
|
||||
} else {
|
||||
self.reset_main.set_margin_start(0);
|
||||
self.reset_main.set_margin_end(0);
|
||||
let div = (width - 540) / 2;
|
||||
if div > 1 {
|
||||
self.reset_main.set_margin_start(div);
|
||||
self.reset_main.set_margin_end(div);
|
||||
} else {
|
||||
self.reset_main.set_margin_start(0);
|
||||
self.reset_main.set_margin_end(0);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -59,45 +59,24 @@
|
|||
</object>
|
||||
</child>
|
||||
<child>
|
||||
<object class="AdwPreferencesGroup">
|
||||
<object class="AdwPreferencesGroup" id="reset_bluetooth_available_devices">
|
||||
<property name="header-suffix">
|
||||
<object class="GtkButton" id="reset_bluetooth_refresh_button">
|
||||
<property name="icon-name">view-refresh-symbolic</property>
|
||||
</object>
|
||||
</property>
|
||||
<property name="margin-top">10</property>
|
||||
<property name="margin-end">5</property>
|
||||
<property name="margin-start">5</property>
|
||||
<property name="margin-top">5</property>
|
||||
<property name="title">Available Devices</property>
|
||||
<child>
|
||||
<object class="GtkScrolledWindow">
|
||||
<property name="min-content-height">100</property>
|
||||
<property name="propagate-natural-height">True</property>
|
||||
<child>
|
||||
<object class="GtkViewport">
|
||||
<child>
|
||||
<object class="AdwPreferencesGroup" id="reset_bluetooth_available_devices"/>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
<child>
|
||||
<object class="AdwPreferencesGroup">
|
||||
<object class="AdwPreferencesGroup" id="reset_bluetooth_connected_devices">
|
||||
<property name="margin-end">5</property>
|
||||
<property name="margin-start">5</property>
|
||||
<property name="margin-top">5</property>
|
||||
<property name="title">Connected Devices</property>
|
||||
<child>
|
||||
<object class="GtkScrolledWindow">
|
||||
<property name="min-content-height">100</property>
|
||||
<property name="propagate-natural-height">True</property>
|
||||
<child>
|
||||
<object class="GtkViewport">
|
||||
<child>
|
||||
<object class="AdwPreferencesGroup" id="reset_bluetooth_connected_devices"/>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<!-- Created with Cambalache 0.17.0 -->
|
||||
<interface>
|
||||
<requires lib="gtk" version="4.12"/>
|
||||
<requires lib="libadwaita" version="1.3"/>
|
||||
<requires lib="libadwaita" version="1.0"/>
|
||||
<template class="resetBluetoothEntry" parent="AdwActionRow">
|
||||
<property name="child">
|
||||
<object class="GtkBox">
|
||||
|
|
@ -36,11 +36,6 @@
|
|||
</child>
|
||||
</object>
|
||||
</property>
|
||||
<property name="focusable">True</property>
|
||||
<property name="hexpand">True</property>
|
||||
<property name="hexpand-set">True</property>
|
||||
<property name="margin-start">5</property>
|
||||
<property name="subtitle-lines">1</property>
|
||||
<property name="title-lines">1</property>
|
||||
</template>
|
||||
</interface>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<property name="default-height">500</property>
|
||||
<property name="default-width">951</property>
|
||||
<property name="height-request">200</property>
|
||||
<property name="width-request">600</property>
|
||||
<property name="width-request">540</property>
|
||||
<child>
|
||||
<object class="GtkWindowHandle"/>
|
||||
</child>
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
<interface>
|
||||
<requires lib="gtk" version="4.0"/>
|
||||
<template class="resetSettingBox" parent="GtkBox">
|
||||
<property name="css-classes">settings-box</property>
|
||||
<property name="orientation">vertical</property>
|
||||
<property name="width-request">500</property>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -149,21 +149,15 @@
|
|||
(10,173,"AdwComboRow","reset_bluetooth_adapter",172,None,None,None,None,None),
|
||||
(10,174,"AdwActionRow","reset_visibility",172,None,None,None,1,None),
|
||||
(10,175,"GtkImage",None,174,None,None,None,None,None),
|
||||
(10,176,"AdwPreferencesGroup",None,121,None,None,None,1,None),
|
||||
(10,177,"GtkButton","reset_bluetooth_refresh_button",176,None,None,None,None,None),
|
||||
(10,178,"GtkScrolledWindow",None,176,None,None,None,None,None),
|
||||
(10,179,"GtkViewport",None,178,None,None,None,None,None),
|
||||
(10,181,"AdwPreferencesGroup",None,121,None,None,None,2,None),
|
||||
(10,183,"GtkScrolledWindow",None,181,None,None,None,None,None),
|
||||
(10,184,"GtkViewport",None,183,None,None,None,None,None),
|
||||
(10,188,"GtkBox",None,153,None,None,None,4,None),
|
||||
(10,193,"GtkLabel",None,188,None,None,None,None,None),
|
||||
(10,196,"GtkSwitch","reset_bluetooth_discoverable_switch",188,None,None,None,1,None),
|
||||
(10,197,"GtkBox",None,153,None,None,None,3,None),
|
||||
(10,198,"GtkLabel",None,197,None,None,None,None,None),
|
||||
(10,199,"GtkSwitch","reset_bluetooth_pairable_switch",197,None,None,None,1,None),
|
||||
(10,200,"AdwPreferencesGroup","reset_bluetooth_available_devices",179,None,None,None,-1,None),
|
||||
(10,201,"AdwPreferencesGroup","reset_bluetooth_connected_devices",184,None,None,None,-1,None),
|
||||
(10,204,"AdwPreferencesGroup","reset_bluetooth_available_devices",121,None,None,None,1,None),
|
||||
(10,206,"AdwPreferencesGroup","reset_bluetooth_connected_devices",121,None,None,None,2,None),
|
||||
(10,207,"GtkButton","reset_bluetooth_refresh_button",204,None,None,None,-1,None),
|
||||
(11,32,"AdwActionRow","resetBluetoothEntry",None,None,None,None,-1,None),
|
||||
(11,39,"GtkBox",None,32,None,None,None,-1,None),
|
||||
(11,40,"GtkImage","reset_bluetooth_device_type",39,None,None,None,None,None),
|
||||
|
|
@ -332,7 +326,7 @@
|
|||
</object>
|
||||
<object_property>
|
||||
(3,1,"GtkWidget","height-request","200",None,None,None,None,None,None,None,None,None),
|
||||
(3,1,"GtkWidget","width-request","600",None,None,None,None,None,None,None,None,None),
|
||||
(3,1,"GtkWidget","width-request","540",None,None,None,None,None,None,None,None,None),
|
||||
(3,1,"GtkWindow","default-height","500",None,None,None,None,None,None,None,None,None),
|
||||
(3,1,"GtkWindow","default-width","951",None,None,None,None,None,None,None,None,None),
|
||||
(3,2,"AdwOverlaySplitView","content",None,None,None,None,None,3,None,None,None,None),
|
||||
|
|
@ -578,15 +572,6 @@
|
|||
(10,175,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
|
||||
(10,175,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
|
||||
(10,175,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
|
||||
(10,176,"AdwPreferencesGroup","header-suffix",None,None,None,None,None,177,None,None,None,None),
|
||||
(10,176,"AdwPreferencesGroup","title","Available Devices",None,None,None,None,None,None,None,None,None),
|
||||
(10,176,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
|
||||
(10,177,"GtkButton","icon-name","view-refresh-symbolic",None,None,None,None,None,None,None,None,None),
|
||||
(10,178,"GtkScrolledWindow","min-content-height","100",None,None,None,None,None,None,None,None,None),
|
||||
(10,178,"GtkScrolledWindow","propagate-natural-height","True",None,None,None,None,None,None,None,None,None),
|
||||
(10,181,"AdwPreferencesGroup","title","Connected Devices",None,None,None,None,None,None,None,None,None),
|
||||
(10,183,"GtkScrolledWindow","min-content-height","100",None,None,None,None,None,None,None,None,None),
|
||||
(10,183,"GtkScrolledWindow","propagate-natural-height","True",None,None,None,None,None,None,None,None,None),
|
||||
(10,188,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
|
||||
(10,188,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
|
||||
(10,188,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
|
||||
|
|
@ -601,12 +586,17 @@
|
|||
(10,198,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
|
||||
(10,198,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
|
||||
(10,198,"GtkWidget","hexpand-set","True",None,None,None,None,None,None,None,None,None),
|
||||
(11,32,"AdwActionRow","subtitle-lines","1",None,None,None,None,None,None,None,None,None),
|
||||
(11,32,"AdwActionRow","title-lines","1",None,None,None,None,None,None,None,None,None),
|
||||
(10,204,"AdwPreferencesGroup","header-suffix",None,None,None,None,None,207,None,None,None,None),
|
||||
(10,204,"AdwPreferencesGroup","title","Available Devices",None,None,None,None,None,None,None,None,None),
|
||||
(10,204,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
|
||||
(10,204,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
|
||||
(10,204,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
|
||||
(10,206,"AdwPreferencesGroup","title","Connected Devices",None,None,None,None,None,None,None,None,None),
|
||||
(10,206,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
|
||||
(10,206,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
|
||||
(10,206,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
|
||||
(10,207,"GtkButton","icon-name","view-refresh-symbolic",None,None,None,None,None,None,None,None,None),
|
||||
(11,32,"GtkListBoxRow","child",None,None,None,None,None,39,None,None,None,None),
|
||||
(11,32,"GtkWidget","focusable","True",None,None,None,None,None,None,None,None,None),
|
||||
(11,32,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
|
||||
(11,32,"GtkWidget","hexpand-set","True",None,None,None,None,None,None,None,None,None),
|
||||
(11,32,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
|
||||
(11,40,"GtkImage","icon-name","input-mouse-symbolic",None,None,None,None,None,None,None,None,None),
|
||||
(11,40,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
|
||||
|
|
@ -711,6 +701,7 @@
|
|||
(13,41,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
|
||||
(13,42,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
|
||||
(14,3,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
|
||||
(14,3,"GtkWidget","css-classes","settings-box",None,None,None,None,None,None,None,None,None),
|
||||
(14,3,"GtkWidget","width-request","500",None,None,None,None,None,None,None,None,None),
|
||||
(15,1,"GtkListBoxRow","selectable","False",None,None,None,None,None,None,None,None,None),
|
||||
(15,1,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
|
||||
|
|
|
|||
|
|
@ -24,3 +24,7 @@ label.resetSettingLabel {
|
|||
row.audioRow {
|
||||
border-color: transparent;
|
||||
}
|
||||
|
||||
flowboxchild {
|
||||
max-width: 800px;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue