djkato/egui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[style] Tweak windows icon positioning

Browse source
This commit is contained in:
Emil Ernerfeldt 2021-01-14 22:47:47 +01:00
parent 8e34cc50be
commit 2b07a75753
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
egui/src/containers/window.rs
View file

@ -653,16 +653,18 @@ fn show_title_bar(
collapsible: bool, collapsible: bool,
) -> TitleBar { ) -> TitleBar {
let (title_bar, response) = ui.horizontal(|ui| { let (title_bar, response) = ui.horizontal(|ui| {
let height = title_label.font_height(ui.fonts(), ui.style()); let height = title_label
.font_height(ui.fonts(), ui.style())
.max(ui.style().spacing.interact_size.y);
ui.set_min_height(height); ui.set_min_height(height);
let item_spacing = ui.style().spacing.item_spacing; let item_spacing = ui.style().spacing.item_spacing;
let button_size = Vec2::splat(ui.style().spacing.icon_width); let button_size = Vec2::splat(ui.style().spacing.icon_width);
let window_pad_x = ui.style().spacing.window_padding.x; let pad = (height - button_size.y) / 2.0; // calculated so that the icon is on the diagonal (if window padding is symmetrical)
if collapsible { if collapsible {
ui.advance_cursor(window_pad_x); ui.advance_cursor(pad);
let (_id, rect) = ui.allocate_space(button_size); let (_id, rect) = ui.allocate_space(button_size);
let collapse_button_response = ui.interact(rect, collapsing_id, Sense::click()); let collapse_button_response = ui.interact(rect, collapsing_id, Sense::click());
@ -677,9 +679,9 @@ fn show_title_bar(
let minimum_width = if collapsible || show_close_button { let minimum_width = if collapsible || show_close_button {
// If at least one button is shown we make room for both buttons (since title is centered): // If at least one button is shown we make room for both buttons (since title is centered):
2.0 * (window_pad_x + button_size.x + item_spacing.x) + title_galley.size.x 2.0 * (pad + button_size.x + item_spacing.x) + title_galley.size.x
} else { } else {
window_pad_x + title_galley.size.x + window_pad_x pad + title_galley.size.x + pad
}; };
let min_rect = Rect::from_min_size(ui.min_rect().min, vec2(minimum_width, height)); let min_rect = Rect::from_min_size(ui.min_rect().min, vec2(minimum_width, height));
let id = ui.advance_cursor_after_rect(min_rect); let id = ui.advance_cursor_after_rect(min_rect);
@ -756,11 +758,11 @@ impl TitleBar {
} }
fn close_button_ui(&self, ui: &mut Ui) -> Response { fn close_button_ui(&self, ui: &mut Ui) -> Response {
let window_pad_x = ui.style().spacing.window_padding.x;
let button_size = Vec2::splat(ui.style().spacing.icon_width); let button_size = Vec2::splat(ui.style().spacing.icon_width);
let pad = (self.rect.height() - button_size.y) / 2.0; // calculated so that the icon is on the diagonal (if window padding is symmetrical)
let button_rect = Rect::from_min_size( let button_rect = Rect::from_min_size(
pos2( pos2(
self.rect.right() - window_pad_x - button_size.x, self.rect.right() - pad - button_size.x,
self.rect.center().y - 0.5 * button_size.y, self.rect.center().y - 0.5 * button_size.y,
), ),
button_size, button_size,