skyler
/
egui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Style/visuals tweaks

This commit is contained in:
Emil Ernerfeldt 2020-05-17 17:44:29 +02:00
parent d123d7e9c6
commit 8f43d38e38
3 changed files with 7 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emigui/src/mesher.rs
View File

@ -159,7 +159,7 @@ impl Path {
} }
pub fn add_circle(&mut self, center: Pos2, radius: f32) { pub fn add_circle(&mut self, center: Pos2, radius: f32) {
let n = (radius * 2.0).round() as i32; // TODO: tweak a bit more let n = (radius * 4.0).round() as i32; // TODO: tweak a bit more
let n = clamp(n, 4..=64); let n = clamp(n, 4..=64);
for i in 0..n { for i in 0..n {
let angle = remap(i as f32, 0.0..=n as f32, 0.0..=TAU); let angle = remap(i as f32, 0.0..=n as f32, 0.0..=TAU);

37
emigui/src/style.rs
View File

@ -100,17 +100,17 @@ impl Default for Interact {
fn default() -> Self { fn default() -> Self {
Self { Self {
active: WidgetStyle { active: WidgetStyle {
bg_fill_color: None, bg_fill_color: Some(gray(0, 128)),
fill_color: srgba(120, 120, 200, 255), fill_color: srgba(120, 120, 200, 255),
stroke_color: WHITE, stroke_color: WHITE,
stroke_width: 2.0, stroke_width: 2.0,
rect_outline: Some(Outline::new(1.0, WHITE)), rect_outline: Some(Outline::new(2.0, WHITE)),
corner_radius: 5.0, corner_radius: 5.0,
}, },
hovered: WidgetStyle { hovered: WidgetStyle {
bg_fill_color: None, bg_fill_color: None,
fill_color: srgba(100, 100, 150, 255), fill_color: srgba(100, 100, 150, 255),
stroke_color: WHITE, stroke_color: gray(240, 255),
stroke_width: 1.5, stroke_width: 1.5,
rect_outline: Some(Outline::new(1.0, WHITE)), rect_outline: Some(Outline::new(1.0, WHITE)),
corner_radius: 5.0, corner_radius: 5.0,
@ -127,37 +127,6 @@ impl Default for Interact {
} }
} }
impl Interact {
pub fn classic() -> Self {
Self {
active: WidgetStyle {
bg_fill_color: Some(srgba(120, 120, 200, 255)),
fill_color: srgba(120, 120, 200, 255),
stroke_color: WHITE,
stroke_width: 2.0,
rect_outline: Some(Outline::new(2.0, WHITE)),
corner_radius: 5.0,
},
hovered: WidgetStyle {
bg_fill_color: Some(srgba(100, 100, 150, 255)),
fill_color: srgba(100, 100, 150, 255),
stroke_color: WHITE,
stroke_width: 1.5,
rect_outline: None,
corner_radius: 5.0,
},
inactive: WidgetStyle {
bg_fill_color: Some(srgba(60, 60, 80, 255)),
fill_color: srgba(60, 60, 80, 255),
stroke_color: gray(220, 255), // Mustn't look grayed out!
stroke_width: 1.0,
rect_outline: None,
corner_radius: 0.0,
},
}
}
}
impl Interact { impl Interact {
pub fn style(&self, interact: &InteractInfo) -> &WidgetStyle { pub fn style(&self, interact: &InteractInfo) -> &WidgetStyle {
if interact.active { if interact.active {

6
example_glium/src/main.rs
View File

@ -88,10 +88,10 @@ fn main() {
while running { while running {
{ {
// Keep smooth frame rate. TODO: proper vsync // Keep smooth frame rate because vsync doesn't work on mac
let frame_duration = frame_start.elapsed(); let frame_duration = frame_start.elapsed();
if frame_duration < Duration::from_millis(33) { if frame_duration < Duration::from_millis(16) {
std::thread::sleep(Duration::from_millis(33) - frame_duration); std::thread::sleep(Duration::from_millis(16) - frame_duration);
} }
frame_start = Instant::now(); frame_start = Instant::now();
} }