aboutsummaryrefslogtreecommitdiff
path: root/alacritty/src/window.rs
diff options
context:
space:
mode:
authorKirill Chibisov <contact@kchibisov.com>2020-10-07 17:40:50 +0300
committerGitHub <noreply@github.com>2020-10-07 17:40:50 +0300
commit67db9b228d3b6c63484ca4b8fcae577afc0ee22a (patch)
tree52e2640140a4786f42d6ac6cf6f081c6dd9b21a2 /alacritty/src/window.rs
parent44a6dba0af03d3b9305ceea31c3289709cc750e3 (diff)
downloadr-alacritty-67db9b228d3b6c63484ca4b8fcae577afc0ee22a.tar.gz
r-alacritty-67db9b228d3b6c63484ca4b8fcae577afc0ee22a.tar.bz2
r-alacritty-67db9b228d3b6c63484ca4b8fcae577afc0ee22a.zip
Bump glutin to 0.25.0
Fixes #4206. Fixes #4162. Fixes #4017. Fixes #3998. Fixes #3831. Fixes #3782. Fixes #3708. Fixes #2734. Fixes #2714. Fixes #1801.
Diffstat (limited to 'alacritty/src/window.rs')
-rw-r--r--alacritty/src/window.rs14
1 files changed, 8 insertions, 6 deletions
diff --git a/alacritty/src/window.rs b/alacritty/src/window.rs
index 92fedc86..1d3b0774 100644
--- a/alacritty/src/window.rs
+++ b/alacritty/src/window.rs
@@ -36,7 +36,7 @@ use winapi::shared::minwindef::WORD;
use alacritty_terminal::index::Point;
use alacritty_terminal::term::SizeInfo;
-use crate::config::window::{Decorations, StartupMode, WindowConfig};
+use crate::config::window::{Decorations, WindowConfig};
use crate::config::Config;
use crate::gl;
@@ -259,7 +259,8 @@ impl Window {
.with_visible(false)
.with_transparent(true)
.with_decorations(window_config.decorations != Decorations::None)
- .with_maximized(window_config.startup_mode == StartupMode::Maximized)
+ .with_maximized(window_config.maximized())
+ .with_fullscreen(window_config.fullscreen())
.with_window_icon(icon.ok())
// X11.
.with_class(class.instance.clone(), class.general.clone())
@@ -282,7 +283,8 @@ impl Window {
.with_visible(false)
.with_decorations(window_config.decorations != Decorations::None)
.with_transparent(true)
- .with_maximized(window_config.startup_mode == StartupMode::Maximized)
+ .with_maximized(window_config.maximized())
+ .with_fullscreen(window_config.fullscreen())
.with_window_icon(icon.ok())
}
@@ -292,7 +294,8 @@ impl Window {
.with_title(title)
.with_visible(false)
.with_transparent(true)
- .with_maximized(window_config.startup_mode == StartupMode::Maximized);
+ .with_maximized(window_config.maximized())
+ .with_fullscreen(window_config.fullscreen());
match window_config.decorations {
Decorations::Full => window,
@@ -360,8 +363,7 @@ impl Window {
pub fn set_fullscreen(&mut self, fullscreen: bool) {
if fullscreen {
- let current_monitor = self.window().current_monitor();
- self.window().set_fullscreen(Some(Fullscreen::Borderless(current_monitor)));
+ self.window().set_fullscreen(Some(Fullscreen::Borderless(None)));
} else {
self.window().set_fullscreen(None);
}