migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-09-02 23:00:04 -04:00
Code Activity

Fix window draging

Browse Source
This commit is contained in:
Konkitoman
2023-07-30 21:49:08 +03:00
parent b8e8d095c8
commit 43ba09531b
1 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
crates/egui/src/containers/window.rs
View File

@@ -669,7 +669,7 @@ impl<'open> Window<'open> {
// END FRAME -------------------------------- // END FRAME --------------------------------
if let Some(title_bar) = title_bar { if let Some(title_bar) = title_bar {
title_bar.ui( let res = title_bar.ui(
&mut area_content_ui, &mut area_content_ui,
outer_rect, outer_rect,
&content_response, &content_response,
@@ -677,6 +677,9 @@ impl<'open> Window<'open> {
&mut collapsing, &mut collapsing,
collapsible, collapsible,
); );
if res.is_pointer_button_down_on() {
ctx.viewport_command(viewport_id, ViewportCommand::Drag);
}
} }
collapsing.store(ctx); collapsing.store(ctx);
@@ -711,18 +714,6 @@ impl<'open> Window<'open> {
); );
} }
if ctx.input(|i| i.pointer.any_pressed()) {
if let Some(interaction) = interaction {
if !interaction.is_resize() {
ctx.viewport_command(viewport_id, ViewportCommand::Drag);
println!("Drag");
} else {
println!("Is resize")
}
} else {
println!("No interaction")
}
}
// let size = ctx.round_vec_to_pixels(full_response.rect.size()); // let size = ctx.round_vec_to_pixels(full_response.rect.size());
if win_size.x < size.x { if win_size.x < size.x {
println!("Set size!"); println!("Set size!");
@@ -1338,7 +1329,7 @@ impl TitleBar {
open: Option<&mut bool>, open: Option<&mut bool>,
collapsing: &mut CollapsingState, collapsing: &mut CollapsingState,
collapsible: bool, collapsible: bool,
) { ) -> Response {
if let Some(content_response) = &content_response { if let Some(content_response) = &content_response {
// Now we know how large we got to be: // Now we know how large we got to be:
self.rect.max.x = self.rect.max.x.max(content_response.rect.max.x); self.rect.max.x = self.rect.max.x.max(content_response.rect.max.x);
@@ -1373,13 +1364,12 @@ impl TitleBar {
// Don't cover the close- and collapse buttons: // Don't cover the close- and collapse buttons:
let double_click_rect = self.rect.shrink2(vec2(32.0, 0.0)); let double_click_rect = self.rect.shrink2(vec2(32.0, 0.0));
if ui let res = ui.interact(double_click_rect, self.id, Sense::click());
.interact(double_click_rect, self.id, Sense::click())
.double_clicked() if res.double_clicked() && collapsible {
&& collapsible
{
collapsing.toggle(ui); collapsing.toggle(ui);
} }
res
} }
/// Paints the "Close" button at the right side of the title bar /// Paints the "Close" button at the right side of the title bar