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

refactor interact style

Browse Source
This commit is contained in:
Emil Ernerfeldt
2020-05-10 08:55:41 +02:00
parent 2bd610cb5b
commit 3a1d677840
10 changed files with 135 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
emigui/src/containers/collapsing_header.rs
View File

@@ -93,15 +93,15 @@ impl CollapsingHeader {
text_pos,
label.text_style,
title,
Some(ui.style().interact_stroke_color(&interact)),
Some(ui.style().interact(&interact).stroke_color),
);
ui.insert_paint_cmd(
where_to_put_background,
PaintCmd::Rect {
corner_radius: ui.style().interact_corner_radius(&interact),
fill_color: ui.style().interact_fill_color(&interact),
outline: ui.style().interact_outline(&interact),
corner_radius: ui.style().interact(&interact).corner_radius,
fill_color: ui.style().interact(&interact).fill_color,
outline: ui.style().interact(&interact).outline,
rect: interact.rect,
},
);
@@ -147,8 +147,8 @@ impl CollapsingHeader {
}
fn paint_icon(ui: &mut Ui, state: &State, interact: &InteractInfo) {
let stroke_color = ui.style().interact_stroke_color(interact);
let stroke_width = ui.style().interact_stroke_width(interact);
let stroke_color = ui.style().interact(interact).stroke_color;
let stroke_width = ui.style().interact(interact).stroke_width;
let (mut small_icon_rect, _) = ui.style().icon_rectangles(interact.rect);
small_icon_rect.set_center(pos2(

4
emigui/src/containers/resize.rs
View File

@@ -235,8 +235,8 @@ impl Resize {
}
fn paint_resize_corner(ui: &mut Ui, interact: &InteractInfo) {
let color = ui.style().interact_stroke_color(interact);
let width = ui.style().interact_stroke_width(interact);
let color = ui.style().interact(interact).stroke_color;
let width = ui.style().interact(interact).stroke_width;
let corner = interact.rect.right_bottom().round(); // TODO: round to pixels
let mut w = 2.0;

4
emigui/src/containers/scroll_area.rs
View File

@@ -164,8 +164,8 @@ impl ScrollArea {
);
let style = outer_ui.style();
let handle_fill_color = style.interact_fill_color(&handle_interact);
let handle_outline = style.interact_outline(&handle_interact);
let handle_fill_color = style.interact(&handle_interact).fill_color;
let handle_outline = style.interact(&handle_interact).outline;
outer_ui.add_paint_cmd(PaintCmd::Rect {
rect: outer_scroll_rect,