aboutsummaryrefslogtreecommitdiff
path: root/alacritty/src/config/window.rs
diff options
context:
space:
mode:
authorKirill Chibisov <contact@kchibisov.com>2022-08-10 16:48:46 +0400
committerGitHub <noreply@github.com>2022-08-10 16:48:46 +0400
commit7d708d53f7ecb4c64db10ae44e7f4fca47c29a85 (patch)
treece76633d705da9b90e7e0d78afa24cef183ee286 /alacritty/src/config/window.rs
parent76c5d01ee2b2178e71df578a109108655a97c24a (diff)
downloadr-alacritty-7d708d53f7ecb4c64db10ae44e7f4fca47c29a85.tar.gz
r-alacritty-7d708d53f7ecb4c64db10ae44e7f4fca47c29a85.tar.bz2
r-alacritty-7d708d53f7ecb4c64db10ae44e7f4fca47c29a85.zip
Bump glutin to 0.29.1
Fixes #6239. Fixes #5975. Fixes #5876. Fixes #5767. Fixes #4484. Fixes #3139.
Diffstat (limited to 'alacritty/src/config/window.rs')
-rw-r--r--alacritty/src/config/window.rs18
1 files changed, 17 insertions, 1 deletions
diff --git a/alacritty/src/config/window.rs b/alacritty/src/config/window.rs
index 08f38b57..8a59a007 100644
--- a/alacritty/src/config/window.rs
+++ b/alacritty/src/config/window.rs
@@ -31,7 +31,13 @@ pub struct WindowConfig {
pub embed: Option<c_ulong>,
/// GTK theme variant.
- pub gtk_theme_variant: Option<String>,
+ #[config(deprecated = "use window.decorations_theme_variant instead")]
+ gtk_theme_variant: Option<String>,
+
+ /// System decorations theme variant.
+ ///
+ /// Controls GTK theme variant on X11 and winit client side decorations on Wayland.
+ decorations_theme_variant: Option<String>,
/// Spread out additional padding evenly.
pub dynamic_padding: bool,
@@ -61,6 +67,7 @@ impl Default for WindowConfig {
decorations: Default::default(),
startup_mode: Default::default(),
embed: Default::default(),
+ decorations_theme_variant: Default::default(),
gtk_theme_variant: Default::default(),
dynamic_padding: Default::default(),
identity: Identity::default(),
@@ -104,6 +111,15 @@ impl WindowConfig {
}
}
+ #[cfg(not(any(target_os = "macos", windows)))]
+ #[inline]
+ pub fn decorations_theme_variant(&self) -> Option<&str> {
+ self.gtk_theme_variant
+ .as_ref()
+ .or_else(|| self.decorations_theme_variant.as_ref())
+ .map(|theme| theme.as_str())
+ }
+
#[inline]
pub fn padding(&self, scale_factor: f64) -> (f32, f32) {
let padding_x = (f32::from(self.padding.x) * scale_factor as f32).floor();