hrev54055 adds 1 changeset to branch 'master'
old head: ff8a1e374cb33ecbb988a59c1c5c433bdaffc9e5
new head: 296183eb6f888274f5a604b94127ee8359020031
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=296183eb6f88+%5Eff8a1e374cb3
----------------------------------------------------------------------------
296183eb6f88: HaikuDepot: UI Colouring Fix
Some text displayed was not using the system
standard colors.
Resolves #11689
Change-Id: Ia415a32f47dff6aa86d343d1acc154527300e924
Reviewed-on: https://review.haiku-os.org/c/haiku/+/2493
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
[ Andrew Lindesay <apl@xxxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev54055
Commit: 296183eb6f888274f5a604b94127ee8359020031
URL: https://git.haiku-os.org/haiku/commit/?id=296183eb6f88
Author: Andrew Lindesay <apl@xxxxxxxxxxxxxx>
Date: Sat Apr 18 09:59:59 2020 UTC
Committer: waddlesplash <waddlesplash@xxxxxxxxx>
Commit-Date: Sat Apr 18 18:17:05 2020 UTC
Ticket: https://dev.haiku-os.org/ticket/11689
----------------------------------------------------------------------------
3 files changed, 5 insertions(+), 10 deletions(-)
src/apps/haikudepot/ui/FeaturedPackagesView.cpp | 2 --
src/apps/haikudepot/ui/PackageInfoView.cpp | 11 +++++------
src/apps/haikudepot/ui/PackageInfoView.h | 2 --
----------------------------------------------------------------------------
diff --git a/src/apps/haikudepot/ui/FeaturedPackagesView.cpp
b/src/apps/haikudepot/ui/FeaturedPackagesView.cpp
index 860d17e465..157b773fdf 100644
--- a/src/apps/haikudepot/ui/FeaturedPackagesView.cpp
+++ b/src/apps/haikudepot/ui/FeaturedPackagesView.cpp
@@ -29,8 +29,6 @@
#define B_TRANSLATION_CONTEXT "FeaturedPackagesView"
-static const rgb_color kLightBlack = (rgb_color){ 60, 60, 60, 255 };
-
static BitmapRef sInstalledIcon(new(std::nothrow)
SharedBitmap(RSRC_INSTALLED), true);
diff --git a/src/apps/haikudepot/ui/PackageInfoView.cpp
b/src/apps/haikudepot/ui/PackageInfoView.cpp
index 52be4db4c7..50582257a9 100644
--- a/src/apps/haikudepot/ui/PackageInfoView.cpp
+++ b/src/apps/haikudepot/ui/PackageInfoView.cpp
@@ -54,7 +54,6 @@
#define B_TRANSLATION_CONTEXT "PackageInfoView"
-static const rgb_color kLightBlack = (rgb_color) { 60, 60, 60, 255 };
static const float kContentTint = (B_NO_TINT + B_LIGHTEN_1_TINT) / 2.0f;
@@ -282,7 +281,7 @@ public:
font.SetSize(std::max(9.0f, floorf(font.Size() * 0.92f)));
font.SetFamilyAndStyle(family, "Italic");
fPublisherView->SetFont(&font);
- fPublisherView->SetHighColor(kLightBlack);
+ fPublisherView->SetHighUIColor(B_PANEL_TEXT_COLOR,
B_LIGHTEN_1_TINT);
// slightly bigger font
GetFont(&font);
@@ -291,7 +290,7 @@ public:
// Version info
fVersionInfo = new BStringView("package version info", "");
fVersionInfo->SetFont(&font);
- fVersionInfo->SetHighColor(kLightBlack);
+ fVersionInfo->SetHighUIColor(B_PANEL_TEXT_COLOR,
B_LIGHTEN_1_TINT);
// Rating view
fRatingView = new TransitReportingRatingView(
@@ -299,14 +298,14 @@ public:
fAvgRating = new BStringView("package average rating", "");
fAvgRating->SetFont(&font);
- fAvgRating->SetHighColor(kLightBlack);
+ fAvgRating->SetHighUIColor(B_PANEL_TEXT_COLOR,
B_LIGHTEN_1_TINT);
fVoteInfo = new BStringView("package vote info", "");
// small font
GetFont(&font);
font.SetSize(std::max(9.0f, floorf(font.Size() * 0.85f)));
fVoteInfo->SetFont(&font);
- fVoteInfo->SetHighColor(kLightBlack);
+ fVoteInfo->SetHighUIColor(B_PANEL_TEXT_COLOR, B_LIGHTEN_1_TINT);
// Rate button
fRateButton = new TransitReportingButton("rate",
@@ -1284,7 +1283,7 @@ PackageInfoView::PackageInfoView(BLocker* modelLock,
BStringView* noPackageView = new BStringView("no package view",
B_TRANSLATE("Click a package to view information"));
- noPackageView->SetHighColor(kLightBlack);
+ noPackageView->SetHighUIColor(B_PANEL_TEXT_COLOR, B_LIGHTEN_1_TINT);
noPackageView->SetExplicitAlignment(BAlignment(
B_ALIGN_HORIZONTAL_CENTER, B_ALIGN_VERTICAL_CENTER));
diff --git a/src/apps/haikudepot/ui/PackageInfoView.h
b/src/apps/haikudepot/ui/PackageInfoView.h
index cec854eaa6..cd6c7b6e4e 100644
--- a/src/apps/haikudepot/ui/PackageInfoView.h
+++ b/src/apps/haikudepot/ui/PackageInfoView.h
@@ -20,8 +20,6 @@ class PagesView;
class TitleView;
enum {
- MSG_VOTE_UP = 'vtup',
- MSG_VOTE_DOWN = 'vtdn',
MSG_RATE_PACKAGE = 'rate',
MSG_SHOW_SCREENSHOT = 'shws',
};
