system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-10-07 00:19:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

WindowServer: Allow specifying different shadows for menus and tooltips

Browse source 
Also update the Redmond 2000 theme to drop shadows more Redmond-like.
This commit is contained in:
Tom 2021-02-09 14:13:06 -07:00 committed by Andreas Kling
parent c9aa7539a6
commit 964894dee6
9 changed files with 49 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Base/res/icons/themes/Redmond/menu-shadow.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.4 KiB

3
Base/res/themes/Default.ini
View file

@ -73,5 +73,6 @@ TitleButtonWidth=15
TitleButtonHeight=15
[Paths]
MenuShadow=/res/icons/themes/Default/window-shadow.png
TooltipShadow=/res/icons/themes/Default/window-shadow.png
WindowShadow=/res/icons/themes/Default/window-shadow.png

2
Base/res/themes/Redmond 2000.ini
View file

@ -68,4 +68,6 @@ TitleButtonWidth=17
TitleButtonHeight=15
[Paths]
MenuShadow=/res/icons/themes/Redmond/menu-shadow.png
TitleButtonIcons=/res/icons/themes/Redmond/16x16/
TooltipShadow=/res/icons/themes/Redmond/menu-shadow.png

2
Userland/Libraries/LibGfx/Palette.h
View file

@ -141,6 +141,8 @@ public:
String title_button_icons_path() const { return path(PathRole::TitleButtonIcons); }
String window_shadow_path() const { return path(PathRole::WindowShadow); }
String menu_shadow_path() const { return path(PathRole::MenuShadow); }
String tooltip_shadow_path() const { return path(PathRole::TooltipShadow); }
Color color(ColorRole role) const { return m_impl->color(role); }
int metric(MetricRole role) const { return m_impl->metric(role); }

2
Userland/Libraries/LibGfx/SystemTheme.cpp
View file

@ -119,6 +119,8 @@ Core::AnonymousBuffer load_system_theme(const String& path)
} while (0)
DO_PATH(TitleButtonIcons);
DO_PATH(MenuShadow);
DO_PATH(TooltipShadow);
DO_PATH(WindowShadow);
return buffer;

2
Userland/Libraries/LibGfx/SystemTheme.h
View file

@ -145,6 +145,8 @@ enum class PathRole {
NoRole,
TitleButtonIcons,
WindowShadow,
MenuShadow,
TooltipShadow,
__Count,
};

47
Userland/Services/WindowServer/WindowFrame.cpp
View file

@ -56,12 +56,16 @@ static Gfx::Bitmap* s_minimize_icon;
static Gfx::Bitmap* s_maximize_icon;
static Gfx::Bitmap* s_restore_icon;
static Gfx::Bitmap* s_close_icon;
static Gfx::Bitmap* s_window_shadow;
static String s_last_title_button_icons_path;
static int s_last_title_button_icons_scale;
static Gfx::Bitmap* s_window_shadow;
static Gfx::Bitmap* s_menu_shadow;
static Gfx::Bitmap* s_tooltip_shadow;
static String s_last_window_shadow_path;
static String s_last_menu_shadow_path;
static String s_last_tooltip_shadow_path;
static Gfx::IntRect frame_rect_for_window(Window& window, const Gfx::IntRect& rect)
{
@ -111,6 +115,15 @@ void WindowFrame::set_button_icons()
if (m_window.is_frameless())
return;
m_close_button->set_icon(*s_close_icon);
if (m_window.is_minimizable())
m_minimize_button->set_icon(*s_minimize_icon);
if (m_window.is_resizable())
m_maximize_button->set_icon(m_window.is_maximized() ? *s_restore_icon : *s_maximize_icon);
}
void WindowFrame::reload_config()
{
String icons_path = WindowManager::the().palette().title_button_icons_path();
int icons_scale = WindowManager::the().compositor_icon_scale();
@ -152,30 +165,34 @@ void WindowFrame::set_button_icons()
full_path.clear();
}
m_close_button->set_icon(*s_close_icon);
if (m_window.is_minimizable())
m_minimize_button->set_icon(*s_minimize_icon);
if (m_window.is_resizable())
m_maximize_button->set_icon(m_window.is_maximized() ? *s_restore_icon : *s_maximize_icon);
s_last_title_button_icons_path = icons_path;
s_last_title_button_icons_scale = icons_scale;
String window_shadow_path = WindowManager::the().palette().window_shadow_path();
if (!s_window_shadow || s_window_shadow->scale() != icons_scale || s_last_window_shadow_path != window_shadow_path) {
s_window_shadow = Gfx::Bitmap::load_from_file(window_shadow_path, icons_scale).leak_ref();
m_shadow_dirty = true;
}
s_last_window_shadow_path = window_shadow_path;
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) {
shadow_bitmap = Gfx::Bitmap::load_from_file(path, s_last_title_button_icons_scale).leak_ref();
last_path = path;
}
};
load_shadow(WindowManager::the().palette().window_shadow_path(), s_last_window_shadow_path, s_window_shadow);
load_shadow(WindowManager::the().palette().menu_shadow_path(), s_last_menu_shadow_path, s_menu_shadow);
load_shadow(WindowManager::the().palette().tooltip_shadow_path(), s_last_tooltip_shadow_path, s_tooltip_shadow);
}
Gfx::Bitmap* WindowFrame::window_shadow() const
{
if (m_window.is_frameless())
return nullptr;
if (m_window.type() == WindowType::Desktop)
switch (m_window.type()) {
case WindowType::Desktop:
return nullptr;
return s_window_shadow;
case WindowType::Menu:
return s_menu_shadow;
case WindowType::Tooltip:
return s_tooltip_shadow;
default:
return s_window_shadow;
}
}
bool WindowFrame::frame_has_alpha() const

2
Userland/Services/WindowServer/WindowFrame.h
View file

@ -41,6 +41,8 @@ class Window;
class WindowFrame {
public:
static void reload_config();
WindowFrame(Window&);
~WindowFrame();

6
Userland/Services/WindowServer/WindowManager.cpp
View file

@ -107,6 +107,8 @@ void WindowManager::reload_config()
m_drag_cursor = get_cursor("Drag");
m_wait_cursor = get_cursor("Wait");
m_crosshair_cursor = get_cursor("Crosshair");
WindowFrame::reload_config();
}
const Gfx::Font& WindowManager::font() const
@ -1434,6 +1436,7 @@ bool WindowManager::update_theme(String theme_path, String theme_name)
m_palette = Gfx::PaletteImpl::create_with_anonymous_buffer(new_theme);
Compositor::the().set_background_color(palette().desktop_background().to_string());
HashTable<ClientConnection*> notified_clients;
WindowFrame::reload_config();
for_each_window([&](Window& window) {
if (window.client()) {
if (!notified_clients.contains(window.client())) {
@ -1523,9 +1526,10 @@ 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.set_button_icons();
window_frame.theme_changed();
return IterationDecision::Continue;
});
}