Skip to content

Commit 05a533f

Browse files
committed
egui changes for i8s
1 parent b8e3988 commit 05a533f

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

src/ui/colour_picker_plugin.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use bevy::prelude::*;
22
use bevy_egui::egui::epaint::Shadow;
3-
use bevy_egui::egui::{Align2, Color32, RichText, Rounding, Vec2};
3+
use bevy_egui::egui::{Align2, Color32, CornerRadius, RichText, Rounding, Vec2};
44
use bevy_egui::{egui, EguiContexts, EguiPlugin};
55

66
use crate::system::clipboard::SystemClipboard;
@@ -55,18 +55,18 @@ impl ColourPickerTool {
5555
.resizable(false)
5656
.frame(egui::Frame {
5757
inner_margin: egui::Margin {
58-
left: 3.0,
59-
right: 3.0,
60-
top: 3.0,
61-
bottom: 3.0,
58+
left: 3,
59+
right: 3,
60+
top: 3,
61+
bottom: 3,
6262
},
6363
outer_margin: egui::Margin {
64-
left: 0.0,
65-
right: 0.0,
66-
top: 0.0,
67-
bottom: 0.0,
64+
left: 0,
65+
right: 0,
66+
top: 0,
67+
bottom: 0,
6868
},
69-
rounding: Rounding::same(2.0),
69+
corner_radius: CornerRadius::default(),
7070
shadow: Shadow::NONE,
7171
fill: Color32::from_black_alpha(2),
7272
stroke: egui::Stroke::NONE,

src/ui/help_ui.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use bevy::prelude::*;
22
use bevy_egui::egui::epaint::Shadow;
3-
use bevy_egui::egui::{Align2, Color32, RichText, Rounding, Vec2};
3+
use bevy_egui::egui::{Align2, Color32, CornerRadius, RichText, Rounding, Vec2};
44
use bevy_egui::{egui, EguiContexts};
55

66
/// Plugin:
@@ -53,18 +53,18 @@ fn help_window(mut ctx: EguiContexts) {
5353
.resizable(false)
5454
.frame(egui::Frame {
5555
inner_margin: egui::Margin {
56-
left: 3.0,
57-
right: 3.0,
58-
top: 3.0,
59-
bottom: 3.0,
56+
left: 3,
57+
right: 3,
58+
top: 3,
59+
bottom: 3,
6060
},
6161
outer_margin: egui::Margin {
62-
left: 0.0,
63-
right: 0.0,
64-
top: 0.0,
65-
bottom: 0.0,
62+
left: 0,
63+
right: 0,
64+
top: 0,
65+
bottom: 0,
6666
},
67-
rounding: Rounding::same(2.0),
67+
corner_radius: CornerRadius::default(),
6868
shadow: Shadow::NONE,
6969
fill: Color32::from_black_alpha(2),
7070
stroke: egui::Stroke::NONE,

0 commit comments

Comments
 (0)