Fix response handling.

uglyoldbob · uglyoldbob · commit fbeb8e19a51f · 2024-08-17T09:05:00.000-05:00
diff --git a/src/schematic.rs b/src/schematic.rs
@@ -744,13 +744,12 @@ impl<'a> egui::Widget for SchematicWidget<'a> {
                                 textnum: i,
                             });
                         }
-                        response.context_menu(|ui| {
+                        let r = response.context_menu(|ui| {
                             if ui.button("Properties").clicked() {
                                 ui.close_menu();
                             }
                         });
-                        // TODO check this for correctness
-                        response
+                        r.map(|r|r.response).or(Some(response)).unwrap()
                     }
                     MouseMode::TextDrag => {
                         if response.clicked() {
@@ -768,13 +767,12 @@ impl<'a> egui::Widget for SchematicWidget<'a> {
                             };
                             actions.push(a);
                         }
-                        response.context_menu(|ui| {
+                        let r = response.context_menu(|ui| {
                             if ui.button("Properties").clicked() {
                                 ui.close_menu();
                             }
                         });
-                        // TODO check this for correctness
-                        response
+                        r.map(|r|r.response).or(Some(response)).unwrap()
                     }
                 };
                 pr = pr.union(response);
@@ -864,7 +862,7 @@ impl<'a> egui::Widget for SchematicWidget<'a> {
             self.sch.schematic_log.apply(&mut self.sch.schematic, a);
         }
 
-        let pr = pr.context_menu(|ui| {
+        let ipr = pr.context_menu(|ui| {
             if ui.button("Do a thing").clicked() {
                 ui.close_menu();
             }
@@ -881,8 +879,7 @@ impl<'a> egui::Widget for SchematicWidget<'a> {
                 focusable: true,
             },
         );
-        //pr.union(response)
-        //TODO fix this
-        response
+
+        pr
     }
 }
diff --git a/src/symbol.rs b/src/symbol.rs
@@ -353,7 +353,6 @@ impl<'a> egui::Widget for SymbolDefinitionWidget<'a> {
                                 ui.close_menu();
                             }
                         });
-                        //TODO check this for correctness
                         response
                     }
                     MouseMode::TextDrag => {
@@ -375,7 +374,6 @@ impl<'a> egui::Widget for SymbolDefinitionWidget<'a> {
                                 ui.close_menu();
                             }
                         });
-                        //TODO check this for correctness
                         response
                     }
                 };
@@ -405,7 +403,6 @@ impl<'a> egui::Widget for SymbolDefinitionWidget<'a> {
                             ui.close_menu();
                         }
                     });
-                    // TODO check this for correctness
                     response
                 }
                 MouseMode::TextDrag => {
@@ -414,22 +411,21 @@ impl<'a> egui::Widget for SymbolDefinitionWidget<'a> {
                             ui.close_menu();
                         }
                     });
-                    //TODO check this for correctness
                     response
                 }
             };
             pr = pr.union(response);
         }
 
-        let pr = pr.context_menu(|ui| {
+        let ipr = pr.context_menu(|ui| {
             if ui.button("Do a thing").clicked() {
                 ui.close_menu();
             }
             if ui.button("Close the menu").clicked() {
                 ui.close_menu();
             }
         });
-        if let Some(pr) = pr {
+        if let Some(pr) = ipr {
             let pos = ui.input(|i| i.pointer.interact_pos());
             if let Some(pos) = pos {
                 let pos2 = pos - zoom_origin.to_vec2();
@@ -483,9 +479,7 @@ impl<'a> egui::Widget for SymbolDefinitionWidget<'a> {
         }
 
         let (_area, response) = ui.allocate_exact_size(size, sense);
-        //pr.union(response)
-        //TODO fix this
-        response
+        pr.union(response)
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -744,13 +744,12 @@ impl<'a> egui::Widget for SchematicWidget<'a> {`
`744`	`744`	`textnum: i,`
`745`	`745`	`});`
`746`	`746`	`}`
`747`		`- response.context_menu(\|ui\| {`
	`747`	`+ let r = response.context_menu(\|ui\| {`
`748`	`748`	`if ui.button("Properties").clicked() {`
`749`	`749`	`ui.close_menu();`
`750`	`750`	`}`
`751`	`751`	`});`
`752`		`- // TODO check this for correctness`
`753`		`- response`
	`752`	`+ r.map(\|r\|r.response).or(Some(response)).unwrap()`
`754`	`753`	`}`
`755`	`754`	`MouseMode::TextDrag => {`
`756`	`755`	`if response.clicked() {`
`@@ -768,13 +767,12 @@ impl<'a> egui::Widget for SchematicWidget<'a> {`
`768`	`767`	`};`
`769`	`768`	`actions.push(a);`
`770`	`769`	`}`
`771`		`- response.context_menu(\|ui\| {`
	`770`	`+ let r = response.context_menu(\|ui\| {`
`772`	`771`	`if ui.button("Properties").clicked() {`
`773`	`772`	`ui.close_menu();`
`774`	`773`	`}`
`775`	`774`	`});`
`776`		`- // TODO check this for correctness`
`777`		`- response`
	`775`	`+ r.map(\|r\|r.response).or(Some(response)).unwrap()`
`778`	`776`	`}`
`779`	`777`	`};`
`780`	`778`	`pr = pr.union(response);`
`@@ -864,7 +862,7 @@ impl<'a> egui::Widget for SchematicWidget<'a> {`
`864`	`862`	`self.sch.schematic_log.apply(&mut self.sch.schematic, a);`
`865`	`863`	`}`
`866`	`864`
`867`		`- let pr = pr.context_menu(\|ui\| {`
	`865`	`+ let ipr = pr.context_menu(\|ui\| {`
`868`	`866`	`if ui.button("Do a thing").clicked() {`
`869`	`867`	`ui.close_menu();`
`870`	`868`	`}`
`@@ -881,8 +879,7 @@ impl<'a> egui::Widget for SchematicWidget<'a> {`
`881`	`879`	`focusable: true,`
`882`	`880`	`},`
`883`	`881`	`);`
`884`		`- //pr.union(response)`
`885`		`- //TODO fix this`
`886`		`- response`
	`882`	`+`
	`883`	`+ pr`
`887`	`884`	`}`
`888`	`885`	`}`
Original file line number	Diff line number	Diff line change
`@@ -353,7 +353,6 @@ impl<'a> egui::Widget for SymbolDefinitionWidget<'a> {`
`353`	`353`	`ui.close_menu();`
`354`	`354`	`}`
`355`	`355`	`});`
`356`		`- //TODO check this for correctness`
`357`	`356`	`response`
`358`	`357`	`}`
`359`	`358`	`MouseMode::TextDrag => {`
`@@ -375,7 +374,6 @@ impl<'a> egui::Widget for SymbolDefinitionWidget<'a> {`
`375`	`374`	`ui.close_menu();`
`376`	`375`	`}`
`377`	`376`	`});`
`378`		`- //TODO check this for correctness`
`379`	`377`	`response`
`380`	`378`	`}`
`381`	`379`	`};`
`@@ -405,7 +403,6 @@ impl<'a> egui::Widget for SymbolDefinitionWidget<'a> {`
`405`	`403`	`ui.close_menu();`
`406`	`404`	`}`
`407`	`405`	`});`
`408`		`- // TODO check this for correctness`
`409`	`406`	`response`
`410`	`407`	`}`
`411`	`408`	`MouseMode::TextDrag => {`
`@@ -414,22 +411,21 @@ impl<'a> egui::Widget for SymbolDefinitionWidget<'a> {`
`414`	`411`	`ui.close_menu();`
`415`	`412`	`}`
`416`	`413`	`});`
`417`		`- //TODO check this for correctness`
`418`	`414`	`response`
`419`	`415`	`}`
`420`	`416`	`};`
`421`	`417`	`pr = pr.union(response);`
`422`	`418`	`}`
`423`	`419`
`424`		`- let pr = pr.context_menu(\|ui\| {`
	`420`	`+ let ipr = pr.context_menu(\|ui\| {`
`425`	`421`	`if ui.button("Do a thing").clicked() {`
`426`	`422`	`ui.close_menu();`
`427`	`423`	`}`
`428`	`424`	`if ui.button("Close the menu").clicked() {`
`429`	`425`	`ui.close_menu();`
`430`	`426`	`}`
`431`	`427`	`});`
`432`		`- if let Some(pr) = pr {`
	`428`	`+ if let Some(pr) = ipr {`
`433`	`429`	`let pos = ui.input(\|i\| i.pointer.interact_pos());`
`434`	`430`	`if let Some(pos) = pos {`
`435`	`431`	`let pos2 = pos - zoom_origin.to_vec2();`
`@@ -483,9 +479,7 @@ impl<'a> egui::Widget for SymbolDefinitionWidget<'a> {`
`483`	`479`	`}`
`484`	`480`
`485`	`481`	`let (_area, response) = ui.allocate_exact_size(size, sense);`
`486`		`- //pr.union(response)`
`487`		`- //TODO fix this`
`488`		`- response`
	`482`	`+ pr.union(response)`
`489`	`483`	`}`
`490`	`484`	`}`
`491`	`485`