Skip to content

Commit 4ae4a1b

Browse files
committed
Adjust window ids & disable save to config
1 parent 82512d0 commit 4ae4a1b

File tree

6 files changed

+10
-7
lines changed

6 files changed

+10
-7
lines changed

src/addon/ui/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ impl Addon {
3030
}
3131

3232
fn render_popups(&mut self, ui: &Ui) {
33-
const CREATE_ERROR_TITLE: &str = "Pack Creation Error";
33+
const CREATE_ERROR_TITLE: &str = "Pack Creation Error##reffect";
3434

3535
if self.create_error {
3636
self.create_error = false;
@@ -39,6 +39,7 @@ impl Addon {
3939

4040
ui.popup_modal(CREATE_ERROR_TITLE)
4141
.always_auto_resize(true)
42+
.save_settings(false)
4243
.build(ui, || {
4344
ui.text("Can not create outside of packs folder");
4445
if ui.button("Ok") {

src/elements/common.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ impl Common {
9292
.nav_focus(false)
9393
.scrollable(false)
9494
.scroll_bar(false)
95+
.save_settings(false)
9596
.build(ui, || {
9697
let hover = ui.is_window_hovered();
9798
self.dragging = hover && ui.is_mouse_down(MouseButton::Left);

src/elements/element.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ impl Element {
109109
}
110110
open = MenuItem::new("Delete").build(ui);
111111
});
112-
let title = format!("Confirm Delete##{id}");
112+
let title = format!("Confirm Delete##reffect{id}");
113113
if open {
114114
ui.open_popup(&title)
115115
}

src/elements/list.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ impl RenderOptions for IconList {
121121

122122
button_color.end();
123123

124-
let title = format!("Confirm Delete##listicon{i}");
124+
let title = format!("Confirm Delete##reffectlisticon{i}");
125125
if !remains {
126126
ui.open_popup(&title);
127127
}

src/elements/pack.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,6 @@ impl Pack {
9797
self.common.render_context_menu(ui, state, Some(children));
9898
open = MenuItem::new("Delete").build(ui);
9999
});
100-
let title = format!("Confirm Delete##{id}");
101-
if open {
102-
ui.open_popup(&title);
103-
}
104100

105101
{
106102
let _style = style_disabled_if(ui, !self.common.enabled);
@@ -111,6 +107,10 @@ impl Pack {
111107
self.common.render_tree_children(ui, state, children);
112108
}
113109

110+
let title = format!("Confirm Delete##reffect{id}");
111+
if open {
112+
ui.open_popup(&title);
113+
}
114114
delete_confirm_modal(ui, &title, || {
115115
ui.text(format!("Delete Pack {}?", self.common.name))
116116
})

src/render_util/popup.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ pub fn delete_confirm_modal(ui: &Ui, title: impl AsRef<str>, body: impl FnOnce()
2020

2121
ui.popup_modal(title)
2222
.always_auto_resize(true)
23+
.save_settings(false)
2324
.build(ui, || {
2425
body();
2526

0 commit comments

Comments
 (0)