Merge pull request #28 from Xetibo/ina

Re-beautify file formatting
This commit is contained in:
takotori 2023-10-28 18:04:21 +02:00 committed by GitHub
commit 90eb5ee941
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -40,23 +40,21 @@ impl Window {
fn setupCallback(&self) { fn setupCallback(&self) {
let selfImp = self.imp(); let selfImp = self.imp();
selfImp.resetSearchEntry selfImp.resetSearchEntry.connect_search_changed(clone!(@ weak self as window => move |_| {
.connect_search_changed(clone!(@ weak self as window => move |_| {
window.filterList(); window.filterList();
})); }));
selfImp.resetSideBarToggle selfImp.resetSideBarToggle.connect_clicked(clone!(@ weak self as window => move |_| {
.connect_clicked(clone!(@ weak self as window => move |_| {
window.toggleSidebar(); window.toggleSidebar();
})); }));
selfImp.resetSidebarList.connect_row_activated( selfImp.resetSidebarList
clone!(@ weak selfImp as flowbox => move |_, y| { .connect_row_activated(clone!(@ weak selfImp as flowbox => move |_, y| {
let result = y.downcast_ref::<SidebarEntry>().unwrap(); let result = y.downcast_ref::<SidebarEntry>().unwrap();
let clickEvent = result.imp().onClickEvent.borrow().onClickEvent; let clickEvent = result.imp().onClickEvent.borrow().onClickEvent;
(clickEvent)(flowbox.resetMain.get()); (clickEvent)(flowbox.resetMain.get());
}), }),
); );
selfImp.resetClose.connect_clicked(clone!(@ weak self as window => move |_| { selfImp.resetClose.connect_clicked(clone!(@ weak self as window => move |_| {
window.close(); window.close();
@ -69,8 +67,7 @@ impl Window {
fn handleDynamicSidebar(&self) { fn handleDynamicSidebar(&self) {
let selfImp = self.imp(); let selfImp = self.imp();
selfImp selfImp.resetSidebarBreakpoint
.resetSidebarBreakpoint
.set_condition(BreakpointCondition::parse("max-width: 500sp").as_ref().ok()); .set_condition(BreakpointCondition::parse("max-width: 500sp").as_ref().ok());
selfImp.resetSidebarBreakpoint.add_setter( selfImp.resetSidebarBreakpoint.add_setter(
&Object::from(selfImp.resetOverlaySplitView.get()), &Object::from(selfImp.resetOverlaySplitView.get()),
@ -94,25 +91,13 @@ impl Window {
} }
continue; continue;
} }
if mainEntry if mainEntry.imp().name.borrow().to_lowercase().contains(&text.to_lowercase()) {
.imp()
.name
.borrow()
.to_lowercase()
.contains(&text.to_lowercase())
{
mainEntry.set_visible(true); mainEntry.set_visible(true);
} else { } else {
mainEntry.set_visible(false); mainEntry.set_visible(false);
} }
for subEntry in subEntries { for subEntry in subEntries {
if subEntry if subEntry.imp().name.borrow().to_lowercase().contains(&text.to_lowercase()) {
.imp()
.name
.borrow()
.to_lowercase()
.contains(&text.to_lowercase())
{
subEntry.set_visible(true); subEntry.set_visible(true);
mainEntry.set_visible(true); mainEntry.set_visible(true);
} else { } else {
@ -217,9 +202,7 @@ impl SidebarEntry {
let entry: SidebarEntry = Object::builder().build(); let entry: SidebarEntry = Object::builder().build();
let entryImp = entry.imp(); let entryImp = entry.imp();
entryImp.resetSidebarLabel.get().set_text(entryName); entryImp.resetSidebarLabel.get().set_text(entryName);
entryImp entryImp.resetSidebarImage.set_from_icon_name(Some(iconName));
.resetSidebarImage
.set_from_icon_name(Some(iconName));
entryImp.category.set(category); entryImp.category.set(category);
entryImp.isSubcategory.set(isSubcategory); entryImp.isSubcategory.set(isSubcategory);
{ {