[haiku-commits] r38121 - in haiku/trunk/src/apps: aboutsystem magnify

  • From: revol@xxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sun, 15 Aug 2010 17:49:09 +0200 (CEST)

Author: mmu_man
Date: 2010-08-15 17:49:09 +0200 (Sun, 15 Aug 2010)
New Revision: 38121
Changeset: http://dev.haiku-os.org/changeset/38121

Modified:
   haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
   haiku/trunk/src/apps/magnify/Magnify.cpp
Log:
Fix some blatantly missing uses of ui_color(), but there is a lot of work to do 
here... BControlLook itself doesn't even respect those correctly either...


Modified: haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
===================================================================
--- haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp    2010-08-15 15:30:42 UTC 
(rev 38120)
+++ haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp    2010-08-15 15:49:09 UTC 
(rev 38121)
@@ -848,6 +848,7 @@
        fCreditsView->MakeEditable(false);
        fCreditsView->SetWordWrap(true);
        fCreditsView->SetInsets(5, 5, 5, 5);
+       fCreditsView->SetViewColor(ui_color(B_DOCUMENT_BACKGROUND_COLOR));
 
        BScrollView* creditsScroller = new BScrollView("creditsScroller",
                fCreditsView, B_WILL_DRAW | B_FRAME_EVENTS, false, true,

Modified: haiku/trunk/src/apps/magnify/Magnify.cpp
===================================================================
--- haiku/trunk/src/apps/magnify/Magnify.cpp    2010-08-15 15:30:42 UTC (rev 
38120)
+++ haiku/trunk/src/apps/magnify/Magnify.cpp    2010-08-15 15:49:09 UTC (rev 
38121)
@@ -897,7 +897,7 @@
        invalRect.Set(10, 5, 10 + StringWidth(fInfoStr), fFontHeight+7);
        SetHighColor(ViewColor());
        FillRect(invalRect);
-       SetHighColor(0, 0, 0, 255);
+       SetHighColor(ui_color(B_PANEL_TEXT_COLOR));
        strcpy(fInfoStr, str);
        DrawString(fInfoStr);
 
@@ -914,7 +914,7 @@
        invalRect.Set(10, fFontHeight+7, 10 + StringWidth(fRGBStr), 
fFontHeight*2+7);
        SetHighColor(ViewColor());
        FillRect(invalRect);
-       SetHighColor(0,0,0,255);
+       SetHighColor(ui_color(B_PANEL_TEXT_COLOR));
        strcpy(fRGBStr,str);
        DrawString(fRGBStr);
 
@@ -933,7 +933,7 @@
                        invalRect.Set(10, h-12-fFontHeight, 10 + 
StringWidth(fCH2Str), h-10);
                        SetHighColor(ViewColor());
                        FillRect(invalRect);
-                       SetHighColor(0,0,0,255);
+                       SetHighColor(ui_color(B_PANEL_TEXT_COLOR));
                        strcpy(fCH2Str,str);
                        DrawString(fCH2Str);
                }
@@ -945,7 +945,7 @@
                        invalRect.Set(10, h-10-2*fFontHeight-2, 10 + 
StringWidth(fCH1Str), h-10-fFontHeight);
                        SetHighColor(ViewColor());
                        FillRect(invalRect);
-                       SetHighColor(0,0,0,255);
+                       SetHighColor(ui_color(B_PANEL_TEXT_COLOR));
                        strcpy(fCH1Str,str);
                        DrawString(fCH1Str);
                } else if (ch1Showing) {
@@ -954,7 +954,7 @@
                        invalRect.Set(10, h-10-fFontHeight, 10 + 
StringWidth(fCH1Str), h-8);
                        SetHighColor(ViewColor());
                        FillRect(invalRect);
-                       SetHighColor(0,0,0,255);
+                       SetHighColor(ui_color(B_PANEL_TEXT_COLOR));
                        strcpy(fCH1Str,str);
                        DrawString(fCH1Str);
                }


Other related posts:

  • » [haiku-commits] r38121 - in haiku/trunk/src/apps: aboutsystem magnify - revol