diff --git a/data/artwork/HAIKU logo - black on white - installer b/data/artwork/HAIKU logo - black on transparent - installer similarity index 95% rename from data/artwork/HAIKU logo - black on white - installer rename to data/artwork/HAIKU logo - black on transparent - installer index 388cf51ff2..eb76933577 100644 Binary files a/data/artwork/HAIKU logo - black on white - installer and b/data/artwork/HAIKU logo - black on transparent - installer differ diff --git a/data/artwork/HAIKU logo - black on transparent - installer - development.png b/data/artwork/HAIKU logo - black on transparent - installer - development.png new file mode 100644 index 0000000000..9f58165ce0 Binary files /dev/null and b/data/artwork/HAIKU logo - black on transparent - installer - development.png differ diff --git a/data/artwork/HAIKU logo - black on transparent - installer.png b/data/artwork/HAIKU logo - black on transparent - installer.png new file mode 100644 index 0000000000..74367b0775 Binary files /dev/null and b/data/artwork/HAIKU logo - black on transparent - installer.png differ diff --git a/data/artwork/HAIKU logo - black on transparent - tiny - versioned.png b/data/artwork/HAIKU logo - black on transparent - tiny - versioned.png new file mode 100644 index 0000000000..c5a4b1ee29 Binary files /dev/null and b/data/artwork/HAIKU logo - black on transparent - tiny - versioned.png differ diff --git a/data/artwork/HAIKU logo - black on transparent - tiny.png b/data/artwork/HAIKU logo - black on transparent - tiny.png index fbce8ebbe3..1b8315bb00 100644 Binary files a/data/artwork/HAIKU logo - black on transparent - tiny.png and b/data/artwork/HAIKU logo - black on transparent - tiny.png differ diff --git a/data/artwork/HAIKU logo - black on white - installer - development.png b/data/artwork/HAIKU logo - black on white - installer - development.png deleted file mode 100644 index 6b25df3aa1..0000000000 Binary files a/data/artwork/HAIKU logo - black on white - installer - development.png and /dev/null differ diff --git a/data/artwork/HAIKU logo - black on white - installer.png b/data/artwork/HAIKU logo - black on white - installer.png deleted file mode 100644 index d064495790..0000000000 Binary files a/data/artwork/HAIKU logo - black on white - installer.png and /dev/null differ diff --git a/data/artwork/HAIKU logo - black on white - tiny b/data/artwork/HAIKU logo - black on white - tiny index 5322209b4c..98f30e722a 100644 Binary files a/data/artwork/HAIKU logo - black on white - tiny and b/data/artwork/HAIKU logo - black on white - tiny differ diff --git a/data/artwork/HAIKU logo - black on white - tiny - versioned b/data/artwork/HAIKU logo - black on white - tiny - versioned index cb81b7a594..0cccf5e126 100644 Binary files a/data/artwork/HAIKU logo - black on white - tiny - versioned and b/data/artwork/HAIKU logo - black on white - tiny - versioned differ diff --git a/data/artwork/HAIKU logo - white on black - tiny b/data/artwork/HAIKU logo - white on black - tiny index f253cc2b4a..31aca1bbad 100644 Binary files a/data/artwork/HAIKU logo - white on black - tiny and b/data/artwork/HAIKU logo - white on black - tiny differ diff --git a/data/artwork/HAIKU logo - white on transparent - installer b/data/artwork/HAIKU logo - white on transparent - installer new file mode 100644 index 0000000000..4d436ea8a5 Binary files /dev/null and b/data/artwork/HAIKU logo - white on transparent - installer differ diff --git a/data/artwork/HAIKU logo - white on transparent - installer - development.png b/data/artwork/HAIKU logo - white on transparent - installer - development.png new file mode 100644 index 0000000000..a9c4e8f2bf Binary files /dev/null and b/data/artwork/HAIKU logo - white on transparent - installer - development.png differ diff --git a/data/artwork/HAIKU logo - white on transparent - installer.png b/data/artwork/HAIKU logo - white on transparent - installer.png new file mode 100644 index 0000000000..c2a8e7cfb0 Binary files /dev/null and b/data/artwork/HAIKU logo - white on transparent - installer.png differ diff --git a/data/artwork/HAIKU logo - white on transparent - tiny - versioned b/data/artwork/HAIKU logo - white on transparent - tiny - versioned new file mode 100644 index 0000000000..dc22ed66b1 Binary files /dev/null and b/data/artwork/HAIKU logo - white on transparent - tiny - versioned differ diff --git a/data/artwork/HAIKU logo - white on transparent - tiny - versioned.png b/data/artwork/HAIKU logo - white on transparent - tiny - versioned.png new file mode 100644 index 0000000000..f919d5dbec Binary files /dev/null and b/data/artwork/HAIKU logo - white on transparent - tiny - versioned.png differ diff --git a/data/artwork/HAIKU logo - white on transparent - tiny.png b/data/artwork/HAIKU logo - white on transparent - tiny.png index 590e8d2017..255ad69101 100644 Binary files a/data/artwork/HAIKU logo - white on transparent - tiny.png and b/data/artwork/HAIKU logo - white on transparent - tiny.png differ diff --git a/data/artwork/Walter logo.png b/data/artwork/Walter logo.png index 98b0c4c216..f6c25ce723 100644 Binary files a/data/artwork/Walter logo.png and b/data/artwork/Walter logo.png differ diff --git a/src/apps/aboutsystem/AboutSystem.cpp b/src/apps/aboutsystem/AboutSystem.cpp index 6991cb1aa1..61d542c3a3 100644 --- a/src/apps/aboutsystem/AboutSystem.cpp +++ b/src/apps/aboutsystem/AboutSystem.cpp @@ -424,14 +424,23 @@ AboutWindow::QuitRequested() LogoView::LogoView() : - BView("logo", B_WILL_DRAW), - fLogo(BTranslationUtils::GetBitmap(B_PNG_FORMAT, "logo.png")) + BView("logo", B_WILL_DRAW) { + SetDrawingMode(B_OP_OVER); + +#ifdef HAIKU_DISTRO_COMPATIBILITY_OFFICIAL + rgb_color bgColor = ui_color(B_DOCUMENT_BACKGROUND_COLOR); + if (bgColor.IsLight()) + fLogo = BTranslationUtils::GetBitmap(B_PNG_FORMAT, "logo.png"); + else + fLogo = BTranslationUtils::GetBitmap(B_PNG_FORMAT, "logo_dark.png"); +#else + fLogo = BTranslationUtils::GetBitmap(B_PNG_FORMAT, "walter_logo.png"); +#endif + // Set view color to panel background color when fLogo is NULL // to prevent a white pixel from being drawn. - if (fLogo != NULL) - SetViewColor(255, 255, 255); - else + if (fLogo == NULL) SetViewUIColor(B_PANEL_BACKGROUND_COLOR); } @@ -468,7 +477,11 @@ LogoView::Draw(BRect updateRect) if (fLogo == NULL) return; - DrawBitmap(fLogo, BPoint((Bounds().Width() - fLogo->Bounds().Width()) / 2, 0)); + BRect bounds(Bounds()); + SetLowColor(ui_color(B_DOCUMENT_BACKGROUND_COLOR)); + FillRect(bounds, B_SOLID_LOW); + + DrawBitmap(fLogo, BPoint((bounds.Width() - fLogo->Bounds().Width()) / 2, 0)); } diff --git a/src/apps/aboutsystem/AboutSystem.rdef b/src/apps/aboutsystem/AboutSystem.rdef index 3f8e319aaf..981c35e2fb 100644 --- a/src/apps/aboutsystem/AboutSystem.rdef +++ b/src/apps/aboutsystem/AboutSystem.rdef @@ -20,10 +20,14 @@ resource app_flags B_SINGLE_LAUNCH; #ifdef HAIKU_DISTRO_COMPATIBILITY_OFFICIAL #ifdef HAIKU_OFFICIAL_RELEASE -resource(1, "logo.png") #'PNG ' import "../../../data/artwork/HAIKU logo - black on white - tiny.png"; +resource(1, "logo.png") #'PNG ' import "../../../data/artwork/HAIKU logo - black on transparent - tiny.png"; +resource(2, "logo_dark.png") #'PNG ' import "../../../data/artwork/HAIKU logo - white on transparent - tiny.png"; #else -resource(1, "logo.png") #'PNG ' import "../../../data/artwork/HAIKU logo - black on white - tiny - versioned.png"; +resource(1, "logo.png") #'PNG ' import "../../../data/artwork/HAIKU logo - black on transparent - tiny - versioned.png"; +resource(2, "logo_dark.png") #'PNG ' import "../../../data/artwork/HAIKU logo - white on transparent - tiny - versioned.png"; #endif +#else +resource(1, "walter_logo.png") #'PNG ' import "../../../data/artwork/Walter logo.png"; #endif resource vector_icon { diff --git a/src/apps/installer/Installer.rdef b/src/apps/installer/Installer.rdef index 7de935a134..2bcce4077d 100644 --- a/src/apps/installer/Installer.rdef +++ b/src/apps/installer/Installer.rdef @@ -19,12 +19,14 @@ resource app_flags B_EXCLUSIVE_LAUNCH; #ifdef HAIKU_DISTRO_COMPATIBILITY_OFFICIAL #ifdef HAIKU_OFFICIAL_RELEASE -resource(1, "logo.png") #'PNG ' import "../../../data/artwork/HAIKU logo - black on white - installer.png"; +resource(1, "logo.png") #'PNG ' import "../../../data/artwork/HAIKU logo - black on transparent - installer.png"; +resource(2, "logo_dark.png") #'PNG ' import "../../../data/artwork/HAIKU logo - white on transparent - installer.png"; #else -resource(1, "logo.png") #'PNG ' import "../../../data/artwork/HAIKU logo - black on white - installer - development.png"; +resource(1, "logo.png") #'PNG ' import "../../../data/artwork/HAIKU logo - black on transparent - installer - development.png"; +resource(2, "logo_dark.png") #'PNG ' import "../../../data/artwork/HAIKU logo - white on transparent - installer - development.png"; #endif #else -resource(1, "logo.png") #'PNG ' import "../../../data/artwork/Walter logo.png"; +resource(1, "walter_logo.png") #'PNG ' import "../../../data/artwork/Walter logo.png"; #endif resource vector_icon { diff --git a/src/apps/installer/InstallerWindow.cpp b/src/apps/installer/InstallerWindow.cpp index c6becbabaf..dcc076fe90 100644 --- a/src/apps/installer/InstallerWindow.cpp +++ b/src/apps/installer/InstallerWindow.cpp @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -107,10 +108,13 @@ LogoView::~LogoView(void) void LogoView::Draw(BRect update) { + BRect bounds(Bounds()); + SetLowColor(ui_color(B_DOCUMENT_BACKGROUND_COLOR)); + FillRect(bounds, B_SOLID_LOW); + if (fLogo == NULL) return; - BRect bounds(Bounds()); BPoint placement; placement.x = (bounds.left + bounds.right - fLogo->Bounds().Width()) / 2; placement.y = (bounds.top + bounds.bottom - fLogo->Bounds().Height()) / 2; @@ -138,7 +142,18 @@ LogoView::GetPreferredSize(float* _width, float* _height) void LogoView::_Init() { - fLogo = BTranslationUtils::GetBitmap(B_PNG_FORMAT, "logo.png"); + SetDrawingMode(B_OP_OVER); + +#ifdef HAIKU_DISTRO_COMPATIBILITY_OFFICIAL + rgb_color bgColor = ui_color(B_DOCUMENT_BACKGROUND_COLOR); + + if (bgColor.IsLight()) + fLogo = BTranslationUtils::GetBitmap(B_PNG_FORMAT, "logo.png"); + else + fLogo = BTranslationUtils::GetBitmap(B_PNG_FORMAT, "logo_dark.png"); +#else + fLogo = BTranslationUtils::GetBitmap(B_PNG_FORMAT, "walter_logo.png"); +#endif } @@ -171,9 +186,10 @@ InstallerWindow::InstallerWindow() LogoView* logoView = new LogoView(); - fStatusView = new BTextView("statusView", be_plain_font, NULL, + rgb_color baseColor = ui_color(B_DOCUMENT_TEXT_COLOR); + fStatusView = new BTextView("statusView", be_plain_font, &baseColor, B_WILL_DRAW); - fStatusView->SetViewColor(255, 255, 255, 255); + fStatusView->SetViewUIColor(B_DOCUMENT_BACKGROUND_COLOR); fStatusView->MakeEditable(false); fStatusView->MakeSelectable(false); @@ -190,7 +206,7 @@ InstallerWindow::InstallerWindow() // Create a group view with a white background since the logo and status text won't have the // same height, this background will show in the remaining space fLogoGroup = new BGroupView(B_HORIZONTAL, 10); - fLogoGroup->SetViewColor(255, 255, 255); + fLogoGroup->SetViewUIColor(B_DOCUMENT_BACKGROUND_COLOR); fLogoGroup->GroupLayout()->SetInsets(0, 0, 10, 0); fLogoGroup->AddChild(logoView); fLogoGroup->AddChild(fStatusView); diff --git a/src/apps/installer/Jamfile b/src/apps/installer/Jamfile index 66b7f63197..7cceced3d6 100644 --- a/src/apps/installer/Jamfile +++ b/src/apps/installer/Jamfile @@ -1,6 +1,6 @@ SubDir HAIKU_TOP src apps installer ; -UsePrivateHeaders shared storage tracker ; +UsePrivateHeaders interface shared storage tracker ; UsePrivateSystemHeaders ; SubDirHdrs [ FDirName $(HAIKU_TOP) src kits tracker ] ;