Skip to content

Commit

Permalink
windows: Fix show: false support on Windows to create a invisable w…
Browse files Browse the repository at this point in the history
…indow.
  • Loading branch information
huacnlee committed Sep 20, 2024
1 parent 550ceec commit f100ecc
Show file tree
Hide file tree
Showing 2 changed files with 212 additions and 2 deletions.
201 changes: 201 additions & 0 deletions crates/gpui/examples/window.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
use gpui::*;
use prelude::FluentBuilder as _;

struct SubWindow {
custom_titlebar: bool,
}

fn button(text: &str, on_click: impl Fn(&mut WindowContext) + 'static) -> impl IntoElement {
div()
.id(SharedString::from(text.to_string()))
.flex_none()
.px_2()
.bg(rgb(0xf7f7f7))
.active(|this| this.opacity(0.85))
.border_1()
.border_color(rgb(0xe0e0e0))
.rounded_md()
.cursor_pointer()
.child(text.to_string())
.on_click(move |_, cx| on_click(cx))
}

impl Render for SubWindow {
fn render(&mut self, _: &mut ViewContext<Self>) -> impl IntoElement {
div()
.flex()
.flex_col()
.bg(rgb(0xffffff))
.size_full()
.gap_2()
.when(self.custom_titlebar, |cx| {
cx.child(
div()
.flex()
.h(px(32.))
.px_4()
.bg(gpui::blue())
.text_color(gpui::white())
.w_full()
.child(
div()
.flex()
.items_center()
.justify_center()
.size_full()
.child("Custom Titlebar"),
),
)
})
.child(
div()
.p_8()
.gap_2()
.child("SubWindow")
.child(button("Close", |cx| {
cx.remove_window();
})),
)
}
}

struct WindowDemo {}

impl WindowDemo {
fn window_bounds(cx: &mut AppContext) -> WindowBounds {
WindowBounds::Windowed(Bounds::centered(None, size(px(300.0), px(300.0)), cx))
}

fn new_normal_window(cx: &mut AppContext) {
let window_bounds = Self::window_bounds(cx);

cx.open_window(
WindowOptions {
window_bounds: Some(window_bounds),
..Default::default()
},
|cx| {
cx.new_view(|_cx| SubWindow {
custom_titlebar: false,
})
},
)
.unwrap();
}

fn new_popup_window(cx: &mut AppContext) {
let window_bounds = Self::window_bounds(cx);

cx.open_window(
WindowOptions {
window_bounds: Some(window_bounds),
kind: WindowKind::PopUp,
..Default::default()
},
|cx| {
cx.new_view(|_cx| SubWindow {
custom_titlebar: false,
})
},
)
.unwrap();
}

fn new_custom_titlebar_window(cx: &mut AppContext) {
let window_bounds = Self::window_bounds(cx);

cx.open_window(
WindowOptions {
titlebar: None,
window_bounds: Some(window_bounds),
..Default::default()
},
|cx| {
cx.new_view(|_cx| SubWindow {
custom_titlebar: true,
})
},
)
.unwrap();
}

fn new_hide_window(cx: &mut AppContext) {
let window_bounds = Self::window_bounds(cx);

cx.open_window(
WindowOptions {
show: false,
window_bounds: Some(window_bounds),
..Default::default()
},
|cx| {
cx.new_view(|_cx| SubWindow {
custom_titlebar: false,
})
},
)
.unwrap();
}

fn new_unmovable_window(cx: &mut AppContext) {
let window_bounds = Self::window_bounds(cx);

cx.open_window(
WindowOptions {
is_movable: false,
titlebar: None,
window_bounds: Some(window_bounds),
..Default::default()
},
|cx| {
cx.new_view(|_cx| SubWindow {
custom_titlebar: false,
})
},
)
.unwrap();
}
}

impl Render for WindowDemo {
fn render(&mut self, _cx: &mut ViewContext<Self>) -> impl IntoElement {
div()
.p_4()
.flex()
.flex_wrap()
.bg(rgb(0xffffff))
.size_full()
.justify_center()
.items_center()
.gap_2()
.child(button("Normal", |cx| {
Self::new_normal_window(cx);
}))
.child(button("Popup", |cx| {
Self::new_popup_window(cx);
}))
.child(button("Custom Titlebar", |cx| {
Self::new_custom_titlebar_window(cx);
}))
.child(button("Invisable", |cx| {
Self::new_hide_window(cx);
}))
.child(button("Unmovable", |cx| {
Self::new_unmovable_window(cx);
}))
}
}

fn main() {
App::new().run(|cx: &mut AppContext| {
let bounds = Bounds::centered(None, size(px(800.0), px(600.0)), cx);
cx.open_window(
WindowOptions {
window_bounds: Some(WindowBounds::Windowed(bounds)),
..Default::default()
},
|cx| cx.new_view(|_cx| WindowDemo {}),
)
.unwrap();
});
}
13 changes: 11 additions & 2 deletions crates/gpui/src/platform/windows/window.rs
Original file line number Diff line number Diff line change
Expand Up @@ -287,14 +287,18 @@ impl WindowsWindow {
.map(|title| title.as_ref())
.unwrap_or(""),
);
let (dwexstyle, dwstyle) = if params.kind == WindowKind::PopUp {
let (dwexstyle, mut dwstyle) = if params.kind == WindowKind::PopUp {
(WS_EX_TOOLWINDOW, WINDOW_STYLE(0x0))
} else {
(
WS_EX_APPWINDOW,
WS_THICKFRAME | WS_SYSMENU | WS_MAXIMIZEBOX | WS_MINIMIZEBOX,
)
};
if !params.show {
dwstyle |= WS_MINIMIZE;
}

let hinstance = get_module_handle();
let display = if let Some(display_id) = params.display_id {
// if we obtain a display_id, then this ID must be valid.
Expand Down Expand Up @@ -357,7 +361,12 @@ impl WindowsWindow {
drop(lock);
SetWindowPlacement(raw_hwnd, &placement)?;
}
unsafe { ShowWindow(raw_hwnd, SW_SHOW).ok()? };

if params.show {
unsafe { ShowWindow(raw_hwnd, SW_SHOW).ok()? };
} else {
unsafe { ShowWindow(raw_hwnd, SW_HIDE).ok()? };
}

Ok(Self(state_ptr))
}
Expand Down

0 comments on commit f100ecc

Please sign in to comment.