summaryrefslogtreecommitdiffstats
path: root/wgpu/src/renderer/widget
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón <hector0193@gmail.com>2019-11-06 20:34:58 +0100
committerLibravatar GitHub <noreply@github.com>2019-11-06 20:34:58 +0100
commitefa8d267b8e1d667902b1e0d0e7c6e4d79e75f6e (patch)
treeefb1b525ed865976bd14d8ee9e664323349aa25e /wgpu/src/renderer/widget
parentae6156f779c24beaabf43ea6110d3ce38e34a998 (diff)
parent6216f197e927aef0993a36c1bb094c7f917d54dd (diff)
downloadiced-efa8d267b8e1d667902b1e0d0e7c6e4d79e75f6e.tar.gz
iced-efa8d267b8e1d667902b1e0d0e7c6e4d79e75f6e.tar.bz2
iced-efa8d267b8e1d667902b1e0d0e7c6e4d79e75f6e.zip
Merge pull request #40 from hecrj/feature/hidpi-support
HiDPI support
Diffstat (limited to 'wgpu/src/renderer/widget')
-rw-r--r--wgpu/src/renderer/widget/checkbox.rs2
-rw-r--r--wgpu/src/renderer/widget/text.rs7
2 files changed, 6 insertions, 3 deletions
diff --git a/wgpu/src/renderer/widget/checkbox.rs b/wgpu/src/renderer/widget/checkbox.rs
index ea7a4c0b..5867a36f 100644
--- a/wgpu/src/renderer/widget/checkbox.rs
+++ b/wgpu/src/renderer/widget/checkbox.rs
@@ -76,7 +76,7 @@ impl checkbox::Renderer for Renderer {
a: 1.0,
}
}),
- border_radius: 6,
+ border_radius: 5,
},
);
diff --git a/wgpu/src/renderer/widget/text.rs b/wgpu/src/renderer/widget/text.rs
index 82f75f09..29e07ff7 100644
--- a/wgpu/src/renderer/widget/text.rs
+++ b/wgpu/src/renderer/widget/text.rs
@@ -6,6 +6,9 @@ use wgpu_glyph::{GlyphCruncher, Section};
use std::cell::RefCell;
use std::f32;
+// TODO: Obtain from renderer configuration
+const DEFAULT_TEXT_SIZE: f32 = 20.0;
+
impl text::Renderer for Renderer {
fn node(&self, text: &Text) -> Node {
let glyph_brush = self.glyph_brush.clone();
@@ -18,7 +21,7 @@ impl text::Renderer for Renderer {
// I noticed that the first measure is the one that matters in
// practice. Here, we use a RefCell to store the cached measurement.
let measure = RefCell::new(None);
- let size = text.size.map(f32::from).unwrap_or(20.0);
+ let size = text.size.map(f32::from).unwrap_or(DEFAULT_TEXT_SIZE);
let style = Style::default().width(text.width);
@@ -71,7 +74,7 @@ impl text::Renderer for Renderer {
(
Primitive::Text {
content: text.content.clone(),
- size: f32::from(text.size.unwrap_or(20)),
+ size: text.size.map(f32::from).unwrap_or(DEFAULT_TEXT_SIZE),
bounds: layout.bounds(),
color: text.color.unwrap_or(Color::BLACK),
horizontal_alignment: text.horizontal_alignment,