i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HaikuDepot: UI Colouring Fix

Browse Source 
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 <[email protected]>
This commit is contained in:
Andrew Lindesay
2020-04-18 18:17:05 +00:00
committed by waddlesplash
parent ff8a1e374c
commit 296183eb6f
3 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/haikudepot/ui/FeaturedPackagesView.cpp
-2
View File
@@ -29,8 +29,6 @@
#define B_TRANSLATION_CONTEXT "FeaturedPackagesView" #define B_TRANSLATION_CONTEXT "FeaturedPackagesView"
static const rgb_color kLightBlack = (rgb_color){ 60, 60, 60, 255 };
static BitmapRef sInstalledIcon(new(std::nothrow) static BitmapRef sInstalledIcon(new(std::nothrow)
SharedBitmap(RSRC_INSTALLED), true); SharedBitmap(RSRC_INSTALLED), true);
src/apps/haikudepot/ui/PackageInfoView.cpp
+5 -6
View File
@@ -54,7 +54,6 @@
#define B_TRANSLATION_CONTEXT "PackageInfoView" #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; 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.SetSize(std::max(9.0f, floorf(font.Size() * 0.92f)));
font.SetFamilyAndStyle(family, "Italic"); font.SetFamilyAndStyle(family, "Italic");
fPublisherView->SetFont(&font); fPublisherView->SetFont(&font);
fPublisherView->SetHighColor(kLightBlack); fPublisherView->SetHighUIColor(B_PANEL_TEXT_COLOR, B_LIGHTEN_1_TINT);
// slightly bigger font // slightly bigger font
GetFont(&font); GetFont(&font);
@@ -291,7 +290,7 @@ public:
// Version info // Version info
fVersionInfo = new BStringView("package version info", ""); fVersionInfo = new BStringView("package version info", "");
fVersionInfo->SetFont(&font); fVersionInfo->SetFont(&font);
fVersionInfo->SetHighColor(kLightBlack); fVersionInfo->SetHighUIColor(B_PANEL_TEXT_COLOR, B_LIGHTEN_1_TINT);
// Rating view // Rating view
fRatingView = new TransitReportingRatingView( fRatingView = new TransitReportingRatingView(
@@ -299,14 +298,14 @@ public:
fAvgRating = new BStringView("package average rating", ""); fAvgRating = new BStringView("package average rating", "");
fAvgRating->SetFont(&font); fAvgRating->SetFont(&font);
fAvgRating->SetHighColor(kLightBlack); fAvgRating->SetHighUIColor(B_PANEL_TEXT_COLOR, B_LIGHTEN_1_TINT);
fVoteInfo = new BStringView("package vote info", ""); fVoteInfo = new BStringView("package vote info", "");
// small font // small font
GetFont(&font); GetFont(&font);
font.SetSize(std::max(9.0f, floorf(font.Size() * 0.85f))); font.SetSize(std::max(9.0f, floorf(font.Size() * 0.85f)));
fVoteInfo->SetFont(&font); fVoteInfo->SetFont(&font);
fVoteInfo->SetHighColor(kLightBlack); fVoteInfo->SetHighUIColor(B_PANEL_TEXT_COLOR, B_LIGHTEN_1_TINT);
// Rate button // Rate button
fRateButton = new TransitReportingButton("rate", fRateButton = new TransitReportingButton("rate",
@@ -1284,7 +1283,7 @@ PackageInfoView::PackageInfoView(BLocker* modelLock,
BStringView* noPackageView = new BStringView("no package view", BStringView* noPackageView = new BStringView("no package view",
B_TRANSLATE("Click a package to view information")); B_TRANSLATE("Click a package to view information"));
noPackageView->SetHighColor(kLightBlack); noPackageView->SetHighUIColor(B_PANEL_TEXT_COLOR, B_LIGHTEN_1_TINT);
noPackageView->SetExplicitAlignment(BAlignment( noPackageView->SetExplicitAlignment(BAlignment(
B_ALIGN_HORIZONTAL_CENTER, B_ALIGN_VERTICAL_CENTER)); B_ALIGN_HORIZONTAL_CENTER, B_ALIGN_VERTICAL_CENTER));
src/apps/haikudepot/ui/PackageInfoView.h
-2
View File
@@ -20,8 +20,6 @@ class PagesView;
class TitleView; class TitleView;
enum { enum {
MSG_VOTE_UP = 'vtup',
MSG_VOTE_DOWN = 'vtdn',
MSG_RATE_PACKAGE = 'rate', MSG_RATE_PACKAGE = 'rate',
MSG_SHOW_SCREENSHOT = 'shws', MSG_SHOW_SCREENSHOT = 'shws',
}; };