From 2de2448d664c664106d5649f6b0c7f49846a05fb Mon Sep 17 00:00:00 2001
From: ForLoveOfCats <ForLoveOfCats@vivaldi.net>
Date: Thu, 2 Jul 2020 00:18:38 -0400
Subject: [PATCH] Re-export `druid_shell::Scalable`

---
 CHANGELOG.md     | 3 +++
 druid/src/lib.rs | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e769df73d2..861daa587b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ You can find its changes [documented below](#060---2020-06-01).
 - `Scale::from_scale` to `Scale::new`, and `Scale` methods `scale_x` / `scale_y` to `x` / `y`. ([#1042] by [@xStrom])
 - Major rework of keyboard event handling ([#1049] by [@raphlinus])
 - `Container::rounded` takes `KeyOrValue<f64>` instead of `f64`. ([#1054] by [@binomial0])
+- Re-export `druid_shell::Scalable` under `druid` namespace ([#1075] by [@ForLoveOfCats])
 
 ### Deprecated
 
@@ -240,6 +241,7 @@ Last release without a changelog :(
 [@raphlinus]: https://github.com/raphlinus
 [@binomial0]: https://github.com/binomial0
 [@chris-zen]: https://github.com/chris-zen
+[@ForLoveOfCats]: https://github.com/ForLoveOfCats
 
 [#599]: https://github.com/linebender/druid/pull/599
 [#611]: https://github.com/linebender/druid/pull/611
@@ -348,6 +350,7 @@ Last release without a changelog :(
 [#1054]: https://github.com/linebender/druid/pull/1054
 [#1058]: https://github.com/linebender/druid/pull/1058
 [#1062]: https://github.com/linebender/druid/pull/1062
+[#1075]: https://github.com/linebender/druid/pull/1075
 
 [Unreleased]: https://github.com/linebender/druid/compare/v0.6.0...master
 [0.6.0]: https://github.com/linebender/druid/compare/v0.5.0...v0.6.0
diff --git a/druid/src/lib.rs b/druid/src/lib.rs
index 89152c1022..0bb2244708 100644
--- a/druid/src/lib.rs
+++ b/druid/src/lib.rs
@@ -171,7 +171,7 @@ pub use shell::keyboard_types;
 pub use shell::{
     Application, Clipboard, ClipboardFormat, Code, Cursor, Error as PlatformError,
     FileDialogOptions, FileInfo, FileSpec, FormatId, HotKey, KbKey, KeyEvent, Location, Modifiers,
-    MouseButton, MouseButtons, RawMods, Scale, SysMods, Text, TimerToken, WindowHandle,
+    MouseButton, MouseButtons, RawMods, Scalable, Scale, SysMods, Text, TimerToken, WindowHandle,
 };
 
 pub use crate::core::WidgetPod;