From dc0d6e4c0d65d099bde2def1229b3e9a26f2d937 Mon Sep 17 00:00:00 2001 From: Stefano Ceccherini Date: Mon, 18 Feb 2008 08:57:35 +0000 Subject: [PATCH] Set the LowColor as ViewColor, so text looks better. Fix a few menufield position/size issues. Use B_PANEL_BACKGROUND_COLOR instead of the raw numbers. Fixes bug #1800. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23996 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/translators/libtiff/TIFFView.cpp | 4 ++++ src/add-ons/translators/ppm/PPMTranslator.cpp | 4 +++- src/add-ons/translators/sgi/SGIView.cpp | 1 + src/add-ons/translators/tga/TGAView.cpp | 1 + src/add-ons/translators/tiff/TIFFView.cpp | 3 ++- src/add-ons/translators/wonderbrush/WonderBrushView.cpp | 1 + 6 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/add-ons/translators/libtiff/TIFFView.cpp b/src/add-ons/translators/libtiff/TIFFView.cpp index fcf35974b6..0c2c255b82 100644 --- a/src/add-ons/translators/libtiff/TIFFView.cpp +++ b/src/add-ons/translators/libtiff/TIFFView.cpp @@ -80,6 +80,7 @@ TIFFView::TIFFView(const BRect &frame, const char *name, fSettings = settings; SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); + SetLowColor(ViewColor()); BPopUpMenu* menu = new BPopUpMenu("pick compression"); @@ -99,6 +100,9 @@ TIFFView::TIFFView(const BRect &frame, const char *name, fCompressionMF = new BMenuField(BRect(20, 50, 215, 70), "compression", "Use Compression:", menu, true); + fCompressionMF->ResizeToPreferred(); + fCompressionMF->SetDivider( + fCompressionMF->StringWidth(fCompressionMF->Label()) + 7); AddChild(fCompressionMF); } diff --git a/src/add-ons/translators/ppm/PPMTranslator.cpp b/src/add-ons/translators/ppm/PPMTranslator.cpp index 3068d5d854..46ba730b61 100644 --- a/src/add-ons/translators/ppm/PPMTranslator.cpp +++ b/src/add-ons/translators/ppm/PPMTranslator.cpp @@ -436,7 +436,8 @@ public: uint32 flags) : BView(frame, name, resize, flags) { - SetViewColor(220,220,220,0); + SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); + SetLowColor(ViewColor()); mMenu = new BPopUpMenu("Color Space"); mMenu->AddItem(new BMenuItem("None", CSMessage(B_NO_COLOR_SPACE))); mMenu->AddItem(new BMenuItem("RGB 8:8:8 32 bits", CSMessage(B_RGB32))); @@ -458,6 +459,7 @@ public: mMenu->AddItem(new BMenuItem("RGBA 5:5:5:1 16 bits big-endian", CSMessage(B_RGBA15_BIG))); mMenu->AddItem(new BMenuItem("RGB 5:6:5 16 bits big-endian", CSMessage(B_RGB16))); mField = new BMenuField(BRect(10,110,190,130), "Color Space Field", "Input Color Space", mMenu); + mField->SetDivider(mField->StringWidth(mField->Label()) + 7); mField->SetViewColor(ViewColor()); AddChild(mField); SelectColorSpace(g_settings.out_space); diff --git a/src/add-ons/translators/sgi/SGIView.cpp b/src/add-ons/translators/sgi/SGIView.cpp index 015f1ef630..512f246aee 100644 --- a/src/add-ons/translators/sgi/SGIView.cpp +++ b/src/add-ons/translators/sgi/SGIView.cpp @@ -78,6 +78,7 @@ SGIView::SGIView(const BRect &frame, const char *name, fSettings(settings) { SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); + SetLowColor(ViewColor()); BPopUpMenu* menu = new BPopUpMenu("pick compression"); diff --git a/src/add-ons/translators/tga/TGAView.cpp b/src/add-ons/translators/tga/TGAView.cpp index ae26237b4f..24fd14c450 100644 --- a/src/add-ons/translators/tga/TGAView.cpp +++ b/src/add-ons/translators/tga/TGAView.cpp @@ -53,6 +53,7 @@ TGAView::TGAView(const BRect &frame, const char *name, fSettings = settings; SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); + SetLowColor(ViewColor()); BMessage *pmsg; int32 val; diff --git a/src/add-ons/translators/tiff/TIFFView.cpp b/src/add-ons/translators/tiff/TIFFView.cpp index d5e7b5e703..684dec1411 100644 --- a/src/add-ons/translators/tiff/TIFFView.cpp +++ b/src/add-ons/translators/tiff/TIFFView.cpp @@ -50,7 +50,8 @@ TIFFView::TIFFView(const BRect &frame, const char *name, uint32 resize, uint32 flags) : BView(frame, name, resize, flags) { - SetViewColor(220,220,220,0); + SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); + SetLowColor(ViewColor()); } // --------------------------------------------------------------- diff --git a/src/add-ons/translators/wonderbrush/WonderBrushView.cpp b/src/add-ons/translators/wonderbrush/WonderBrushView.cpp index d5c5af070a..df96c025f0 100644 --- a/src/add-ons/translators/wonderbrush/WonderBrushView.cpp +++ b/src/add-ons/translators/wonderbrush/WonderBrushView.cpp @@ -44,6 +44,7 @@ WonderBrushView::WonderBrushView(const BRect &frame, const char *name, fSettings(settings) { SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); + SetLowColor(ViewColor()); // figure out where the text ends font_height fh;