Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

reenable transparency

Browse source
This commit is contained in:
Junkui Zhang 2025-07-16 17:14:24 +08:00
parent ffbb47452d
commit 46fc76fdf8
2 changed files with 64 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

50
crates/gpui/src/platform/windows/directx_renderer.rs
View file

@ -1,4 +1,4 @@
use std::sync::Arc; use std::{mem::ManuallyDrop, sync::Arc};
use ::util::ResultExt; use ::util::ResultExt;
use anyhow::{Context, Result}; use anyhow::{Context, Result};
@ -37,7 +37,7 @@ pub(crate) struct DirectXDevices {
} }
struct DirectXContext { struct DirectXContext {
swap_chain: IDXGISwapChain1, swap_chain: ManuallyDrop<IDXGISwapChain1>,
back_buffer: [Option<ID3D11RenderTargetView>; 1], back_buffer: [Option<ID3D11RenderTargetView>; 1],
viewport: [D3D11_VIEWPORT; 1], viewport: [D3D11_VIEWPORT; 1],
// #[cfg(not(feature = "enable-renderdoc"))] // #[cfg(not(feature = "enable-renderdoc"))]
@ -212,13 +212,35 @@ impl DirectXRenderer {
&mut self, &mut self,
background_appearance: WindowBackgroundAppearance, background_appearance: WindowBackgroundAppearance,
) -> Result<()> { ) -> Result<()> {
if background_appearance != WindowBackgroundAppearance::Opaque { let transparent = background_appearance != WindowBackgroundAppearance::Opaque;
Err(anyhow::anyhow!( if self.transparent == transparent {
"Set transparent background not supported when feature \"enable-renderdoc\" is enabled." return Ok(());
))
} else {
Ok(())
} }
self.transparent = transparent;
// unsafe {
// // recreate the swapchain
// self.devices.device_context.OMSetRenderTargets(None, None);
// drop(self.context.back_buffer[0].take().unwrap());
// ManuallyDrop::drop(&mut self.context.swap_chain);
// self.context.swap_chain = create_swap_chain_default(
// &self.devices.dxgi_factory,
// &self.devices.device,
// self.hwnd,
// transparent,
// )?;
// self.context.back_buffer = [Some(set_render_target_view(
// &self.context.swap_chain,
// &self.devices.device,
// &self.devices.device_context,
// )?)];
// self.context.viewport = set_viewport(
// &self.devices.device_context,
// self.context.viewport[0].Width,
// self.context.viewport[0].Height,
// );
// set_rasterizer_state(&self.devices.device, &self.devices.device_context)?;
// }
Ok(())
} }
fn draw_shadows(&mut self, shadows: &[Shadow]) -> Result<()> { fn draw_shadows(&mut self, shadows: &[Shadow]) -> Result<()> {
@ -851,6 +873,14 @@ struct PathSprite {
color: Background, color: Background,
} }
impl Drop for DirectXContext {
fn drop(&mut self) {
unsafe {
ManuallyDrop::drop(&mut self.swap_chain);
}
}
}
#[inline] #[inline]
fn get_dxgi_factory() -> Result<IDXGIFactory6> { fn get_dxgi_factory() -> Result<IDXGIFactory6> {
#[cfg(debug_assertions)] #[cfg(debug_assertions)]
@ -948,7 +978,7 @@ fn create_swap_chain_default(
device: &ID3D11Device, device: &ID3D11Device,
hwnd: HWND, hwnd: HWND,
_transparent: bool, _transparent: bool,
) -> Result<IDXGISwapChain1> { ) -> Result<ManuallyDrop<IDXGISwapChain1>> {
use windows::Win32::Graphics::Dxgi::DXGI_MWA_NO_ALT_ENTER; use windows::Win32::Graphics::Dxgi::DXGI_MWA_NO_ALT_ENTER;
let desc = DXGI_SWAP_CHAIN_DESC1 { let desc = DXGI_SWAP_CHAIN_DESC1 {
@ -970,7 +1000,7 @@ fn create_swap_chain_default(
let swap_chain = let swap_chain =
unsafe { dxgi_factory.CreateSwapChainForHwnd(device, hwnd, &desc, None, None) }?; unsafe { dxgi_factory.CreateSwapChainForHwnd(device, hwnd, &desc, None, None) }?;
unsafe { dxgi_factory.MakeWindowAssociation(hwnd, DXGI_MWA_NO_ALT_ENTER) }?; unsafe { dxgi_factory.MakeWindowAssociation(hwnd, DXGI_MWA_NO_ALT_ENTER) }?;
Ok(swap_chain) Ok(ManuallyDrop::new(swap_chain))
} }
#[inline] #[inline]

48
crates/gpui/src/platform/windows/window.rs
View file

@ -384,8 +384,7 @@ impl WindowsWindow {
(WS_EX_TOOLWINDOW | WS_EX_LAYERED, WINDOW_STYLE(0x0)) (WS_EX_TOOLWINDOW | WS_EX_LAYERED, WINDOW_STYLE(0x0))
} else { } else {
( (
// WS_EX_APPWINDOW | WS_EX_LAYERED, WS_EX_APPWINDOW | WS_EX_LAYERED,
WS_EX_APPWINDOW,
WS_THICKFRAME | WS_SYSMENU | WS_MAXIMIZEBOX | WS_MINIMIZEBOX, WS_THICKFRAME | WS_SYSMENU | WS_MAXIMIZEBOX | WS_MINIMIZEBOX,
) )
}; };
@ -403,7 +402,7 @@ impl WindowsWindow {
handle, handle,
hide_title_bar, hide_title_bar,
display, display,
transparent: true, transparent: false,
is_movable: params.is_movable, is_movable: params.is_movable,
min_size: params.window_min_size, min_size: params.window_min_size,
executor, executor,
@ -462,7 +461,7 @@ impl WindowsWindow {
// window is going to be composited with per-pixel alpha, but the render // window is going to be composited with per-pixel alpha, but the render
// pipeline is responsible for effectively calling UpdateLayeredWindow // pipeline is responsible for effectively calling UpdateLayeredWindow
// at the appropriate time. // at the appropriate time.
// unsafe { SetLayeredWindowAttributes(hwnd, COLORREF(0), 255, LWA_ALPHA)? }; unsafe { SetLayeredWindowAttributes(hwnd, COLORREF(0), 255, LWA_ALPHA)? };
Ok(Self(state_ptr)) Ok(Self(state_ptr))
} }
@ -707,27 +706,28 @@ impl PlatformWindow for WindowsWindow {
} }
fn set_background_appearance(&self, background_appearance: WindowBackgroundAppearance) { fn set_background_appearance(&self, background_appearance: WindowBackgroundAppearance) {
// let mut window_state = self.0.state.borrow_mut(); let mut window_state = self.0.state.borrow_mut();
// todo(zjk) window_state
// window_state .renderer
// .renderer .update_transparency(background_appearance)
// .update_transparency(background_appearance != WindowBackgroundAppearance::Opaque); .context("Updating window transparency")
.log_err();
// match background_appearance { match background_appearance {
// WindowBackgroundAppearance::Opaque => { WindowBackgroundAppearance::Opaque => {
// // ACCENT_DISABLED // ACCENT_DISABLED
// set_window_composition_attribute(window_state.hwnd, None, 0); set_window_composition_attribute(window_state.hwnd, None, 0);
// } }
// WindowBackgroundAppearance::Transparent => { WindowBackgroundAppearance::Transparent => {
// // Use ACCENT_ENABLE_TRANSPARENTGRADIENT for transparent background // Use ACCENT_ENABLE_TRANSPARENTGRADIENT for transparent background
// set_window_composition_attribute(window_state.hwnd, None, 2); set_window_composition_attribute(window_state.hwnd, None, 2);
// } }
// WindowBackgroundAppearance::Blurred => { WindowBackgroundAppearance::Blurred => {
// // Enable acrylic blur // Enable acrylic blur
// // ACCENT_ENABLE_ACRYLICBLURBEHIND // ACCENT_ENABLE_ACRYLICBLURBEHIND
// set_window_composition_attribute(window_state.hwnd, Some((0, 0, 0, 0)), 4); set_window_composition_attribute(window_state.hwnd, Some((0, 0, 0, 0)), 4);
// } }
// } }
} }
fn minimize(&self) { fn minimize(&self) {