mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 08:57:47 +00:00
WindowServer: Fix switching between shadows and no shadows with themes
We weren't properly handling switching between having a shadow and not having a shadow when switching themes. This allows an empty string in the theme configuration for a shadow path, meaning no shadow should be rendered.
This commit is contained in:
parent
5d4c4bd372
commit
a807d92a32
4 changed files with 25 additions and 11 deletions
|
@ -169,9 +169,20 @@ void WindowFrame::reload_config()
|
|||
s_last_title_button_icons_scale = icons_scale;
|
||||
|
||||
auto load_shadow = [](const String& path, String& last_path, Gfx::Bitmap*& shadow_bitmap) {
|
||||
if (!shadow_bitmap || shadow_bitmap->scale() != s_last_title_button_icons_scale || last_path != path) {
|
||||
if (path.is_empty()) {
|
||||
last_path = String::empty();
|
||||
if (shadow_bitmap) {
|
||||
shadow_bitmap->unref();
|
||||
shadow_bitmap = nullptr;
|
||||
}
|
||||
} else if (!shadow_bitmap || shadow_bitmap->scale() != s_last_title_button_icons_scale || last_path != path) {
|
||||
if (shadow_bitmap)
|
||||
shadow_bitmap->unref();
|
||||
shadow_bitmap = Gfx::Bitmap::load_from_file(path, s_last_title_button_icons_scale).leak_ref();
|
||||
last_path = path;
|
||||
if (shadow_bitmap)
|
||||
last_path = path;
|
||||
else
|
||||
last_path = String::empty();
|
||||
}
|
||||
};
|
||||
load_shadow(WindowManager::the().palette().window_shadow_path(), s_last_window_shadow_path, s_window_shadow);
|
||||
|
|
|
@ -90,6 +90,10 @@ public:
|
|||
void theme_changed()
|
||||
{
|
||||
m_dirty = m_shadow_dirty = true;
|
||||
m_top_bottom = nullptr;
|
||||
m_left_right = nullptr;
|
||||
m_bottom_y = m_right_x = 0;
|
||||
|
||||
layout_buttons();
|
||||
set_button_icons();
|
||||
}
|
||||
|
|
|
@ -1526,7 +1526,6 @@ void WindowManager::reload_icon_bitmaps_after_scale_change(bool allow_hidpi_icon
|
|||
{
|
||||
m_allow_hidpi_icons = allow_hidpi_icons;
|
||||
reload_config();
|
||||
WindowFrame::reload_config();
|
||||
for_each_window([&](Window& window) {
|
||||
auto& window_frame = window.frame();
|
||||
window_frame.theme_changed();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue