Merge branch 'master' into feature/pane-grid-titlebar

4 files changed, 18 insertions, 4 deletions

diff --git a/glow/src/backend.rs b/glow/src/backend.rs
index 882dd605..8b5b4f9c 100644
--- a/glow/src/backend.rs
+++ b/glow/src/backend.rs
@@ -18,6 +18,7 @@ pub struct Backend {
     quad_pipeline: quad::Pipeline,
     text_pipeline: text::Pipeline,
     triangle_pipeline: triangle::Pipeline,
+    default_text_size: u16,
 }
 
 impl Backend {
@@ -33,6 +34,7 @@ impl Backend {
             quad_pipeline,
             text_pipeline,
             triangle_pipeline,
+            default_text_size: settings.default_text_size,
         }
     }
 
@@ -192,6 +194,10 @@ impl backend::Text for Backend {
     const ICON_FONT: Font = font::ICONS;
     const CHECKMARK_ICON: char = font::CHECKMARK_ICON;
 
+    fn default_size(&self) -> u16 {
+        self.default_text_size
+    }
+
     fn measure(
         &self,
         contents: &str,
diff --git a/glow/src/settings.rs b/glow/src/settings.rs
index dce30029..c2c605ef 100644
--- a/glow/src/settings.rs
+++ b/glow/src/settings.rs
@@ -11,6 +11,11 @@ pub struct Settings {
     /// If `None` is provided, a default system font will be chosen.
     pub default_font: Option<&'static [u8]>,
 
+    /// The default size of text.
+    ///
+    /// By default, it will be set to 20.
+    pub default_text_size: u16,
+
     /// The antialiasing strategy that will be used for triangle primitives.
     pub antialiasing: Option<Antialiasing>,
 }
@@ -19,6 +24,7 @@ impl Default for Settings {
     fn default() -> Settings {
         Settings {
             default_font: None,
+            default_text_size: 20,
             antialiasing: None,
         }
     }
diff --git a/glow/src/widget/slider.rs b/glow/src/widget/slider.rs
index cf036829..3a8c2595 100644
--- a/glow/src/widget/slider.rs
+++ b/glow/src/widget/slider.rs
@@ -13,4 +13,4 @@ pub use iced_native::slider::State;
 /// values.
 ///
 /// This is an alias of an `iced_native` slider with an `iced_wgpu::Renderer`.
-pub type Slider<'a, Message> = iced_native::Slider<'a, Message, Renderer>;
+pub type Slider<'a, T, Message> = iced_native::Slider<'a, T, Message, Renderer>;
diff --git a/glow/src/window/compositor.rs b/glow/src/window/compositor.rs
index 2f504ff7..3ad10b59 100644
--- a/glow/src/window/compositor.rs
+++ b/glow/src/window/compositor.rs
@@ -1,4 +1,4 @@
-use crate::{Backend, Renderer, Settings, Viewport};
+use crate::{Backend, Color, Renderer, Settings, Viewport};
 
 use core::ffi::c_void;
 use glow::HasContext;
@@ -21,8 +21,6 @@ impl iced_graphics::window::GLCompositor for Compositor {
     ) -> (Self, Self::Renderer) {
         let gl = glow::Context::from_loader_function(loader_function);
 
-        gl.clear_color(1.0, 1.0, 1.0, 1.0);
-
         // Enable auto-conversion from/to sRGB
         gl.enable(glow::FRAMEBUFFER_SRGB);
 
@@ -60,12 +58,16 @@ impl iced_graphics::window::GLCompositor for Compositor {
         &mut self,
         renderer: &mut Self::Renderer,
         viewport: &Viewport,
+        color: Color,
         output: &<Self::Renderer as iced_native::Renderer>::Output,
         overlay: &[T],
     ) -> mouse::Interaction {
         let gl = &self.gl;
 
+        let [r, g, b, a] = color.into_linear();
+
         unsafe {
+            gl.clear_color(r, g, b, a);
             gl.clear(glow::COLOR_BUFFER_BIT);
         }