Maximize new windows

This commit is contained in:
Max Brunsfeld 2021-11-23 10:13:08 -08:00
parent a0287920e5
commit 091ed9ab47
4 changed files with 38 additions and 14 deletions

View file

@ -12,7 +12,7 @@ use crate::{
fonts::{FontId, GlyphId, Metrics as FontMetrics, Properties as FontProperties},
geometry::{
rect::{RectF, RectI},
vector::{vec2f, Vector2F},
vector::Vector2F,
},
text_layout::{LineLayout, RunStyle},
AnyAction, ClipboardItem, Menu, Scene,
@ -105,13 +105,20 @@ pub trait WindowContext {
fn present_scene(&mut self, scene: Scene);
}
#[derive(Debug)]
pub struct WindowOptions<'a> {
pub bounds: RectF,
pub bounds: WindowBounds,
pub title: Option<&'a str>,
pub titlebar_appears_transparent: bool,
pub traffic_light_position: Option<Vector2F>,
}
#[derive(Debug)]
pub enum WindowBounds {
Maximized,
Fixed(RectF),
}
pub struct PathPromptOptions {
pub files: bool,
pub directories: bool,
@ -157,7 +164,7 @@ pub trait FontSystem: Send + Sync {
impl<'a> Default for WindowOptions<'a> {
fn default() -> Self {
Self {
bounds: RectF::new(Default::default(), vec2f(1024.0, 768.0)),
bounds: WindowBounds::Maximized,
title: Default::default(),
titlebar_appears_transparent: Default::default(),
traffic_light_position: Default::default(),

View file

@ -1,8 +1,11 @@
use crate::{
executor,
geometry::vector::Vector2F,
geometry::{
rect::RectF,
vector::{vec2f, Vector2F},
},
keymap::Keystroke,
platform::{self, Event, WindowContext},
platform::{self, Event, WindowBounds, WindowContext},
Scene,
};
use block::ConcreteBlock;
@ -25,7 +28,6 @@ use objc::{
runtime::{Class, Object, Protocol, Sel, BOOL, NO, YES},
sel, sel_impl,
};
use pathfinder_geometry::vector::vec2f;
use smol::Timer;
use std::{
any::Any,
@ -158,7 +160,11 @@ impl Window {
unsafe {
let pool = NSAutoreleasePool::new(nil);
let frame = options.bounds.to_ns_rect();
let frame = match options.bounds {
WindowBounds::Maximized => RectF::new(Default::default(), vec2f(1024., 768.)),
WindowBounds::Fixed(rect) => rect,
}
.to_ns_rect();
let mut style_mask = NSWindowStyleMask::NSClosableWindowMask
| NSWindowStyleMask::NSMiniaturizableWindowMask
| NSWindowStyleMask::NSResizableWindowMask
@ -177,6 +183,11 @@ impl Window {
);
assert!(!native_window.is_null());
if matches!(options.bounds, WindowBounds::Maximized) {
let screen = native_window.screen();
native_window.setFrame_display_(screen.visibleFrame(), YES);
}
let device =
metal::Device::system_default().expect("could not find default metal device");

View file

@ -1,8 +1,10 @@
use super::CursorStyle;
use crate::{AnyAction, ClipboardItem};
use super::{CursorStyle, WindowBounds};
use crate::{
geometry::vector::{vec2f, Vector2F},
AnyAction, ClipboardItem,
};
use anyhow::{anyhow, Result};
use parking_lot::Mutex;
use pathfinder_geometry::vector::Vector2F;
use std::{
any::Any,
cell::RefCell,
@ -112,7 +114,10 @@ impl super::Platform for Platform {
options: super::WindowOptions,
_executor: Rc<super::executor::Foreground>,
) -> Box<dyn super::Window> {
Box::new(Window::new(options.bounds.size()))
Box::new(Window::new(match options.bounds {
WindowBounds::Maximized => vec2f(1024., 768.),
WindowBounds::Fixed(rect) => rect.size(),
}))
}
fn key_window_id(&self) -> Option<usize> {