RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 05:07:34 +00:00
Code Issues Activity Actions

Revert "Userland: static vs non-static constexpr variables"

Browse source 
This reverts commit 800ea8ea96.

Booting the system no longer worked after these changes.
This commit is contained in:
Linus Groh 2021-05-21 10:30:21 +01:00
parent 68f76b9e37
commit d60ebbbba6
38 changed files with 184 additions and 192 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Userland/Services/WindowServer/Menu.cpp
View file

@ -55,7 +55,7 @@ const Gfx::Font& Menu::font() const
return Gfx::FontDatabase::default_font();
}
static constexpr char s_checked_bitmap_data[] = {
static const char* s_checked_bitmap_data = {
" "
" # "
" ## "
@ -67,7 +67,7 @@ static constexpr char s_checked_bitmap_data[] = {
" "
};
static constexpr char s_submenu_arrow_bitmap_data[] = {
static const char* s_submenu_arrow_bitmap_data = {
" "
" # "
" ## "
@ -80,12 +80,12 @@ static constexpr char s_submenu_arrow_bitmap_data[] = {
};
static Gfx::CharacterBitmap* s_checked_bitmap;
static constexpr int s_checked_bitmap_width = 9;
static constexpr int s_checked_bitmap_height = 9;
static constexpr int s_submenu_arrow_bitmap_width = 9;
static constexpr int s_submenu_arrow_bitmap_height = 9;
static constexpr int s_item_icon_width = 16;
static constexpr int s_stripe_width = 24;
static const int s_checked_bitmap_width = 9;
static const int s_checked_bitmap_height = 9;
static const int s_submenu_arrow_bitmap_width = 9;
static const int s_submenu_arrow_bitmap_height = 9;
static const int s_item_icon_width = 16;
static const int s_stripe_width = 24;
int Menu::content_width() const
{