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

* Remove leftover debug printf()s

Browse Source 
* Fix the layouting of BColorControl so it is now locale aware


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36191 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Adrien Destugues
2010-04-12 18:21:59 +00:00
parent 4343960f55
commit 5608589f03
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/LocaleBackend.cpp
+1 -2
View File
@@ -26,7 +26,7 @@ static void
LoadBackend() LoadBackend()
{ {
image_id libLocaleAddonID = load_add_on("/system/lib/liblocale.so"); image_id libLocaleAddonID = load_add_on("/system/lib/liblocale.so");
printf("backend-id: %ld\n", libLocaleAddonID);
if (libLocaleAddonID < 0) if (libLocaleAddonID < 0)
return; return;
LocaleBackend* (*createInstanceFunc)(); LocaleBackend* (*createInstanceFunc)();
@@ -34,7 +34,6 @@ printf("backend-id: %ld\n", libLocaleAddonID);
B_SYMBOL_TYPE_TEXT, (void**)&createInstanceFunc) != B_OK) B_SYMBOL_TYPE_TEXT, (void**)&createInstanceFunc) != B_OK)
return; return;
printf("invoking creator func\n");
gLocaleBackend = createInstanceFunc(); gLocaleBackend = createInstanceFunc();
} }
src/kits/interface/ColorControl.cpp
+5 -5
View File
@@ -13,6 +13,8 @@
#include <ColorControl.h> #include <ColorControl.h>
#include <algorithm>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@@ -79,11 +81,8 @@ BColorControl::_InitData(color_control_layout layout, float size,
// we need to translate some strings, and in order to do so, we need // we need to translate some strings, and in order to do so, we need
// to use the LocaleBackend to reache liblocale.so // to use the LocaleBackend to reache liblocale.so
if (gLocaleBackend == NULL) if (gLocaleBackend == NULL)
{
printf("trying to load backend\n");
LocaleBackend::LoadBackend(); LocaleBackend::LoadBackend();
printf("backend = %p\n", gLocaleBackend);
}
fPaletteMode = BScreen(B_MAIN_SCREEN_ID).ColorSpace() == B_CMAP8; fPaletteMode = BScreen(B_MAIN_SCREEN_ID).ColorSpace() == B_CMAP8;
//TODO: we don't support workspace and colorspace changing for now //TODO: we don't support workspace and colorspace changing for now
// so we take the main_screen colorspace at startup // so we take the main_screen colorspace at startup
@@ -115,7 +114,8 @@ printf("backend = %p\n", gLocaleBackend);
SetValue(value); SetValue(value);
} else { } else {
BRect rect(0.0f, 0.0f, 70.0f, 15.0f); BRect rect(0.0f, 0.0f, 70.0f, 15.0f);
float labelWidth = StringWidth("Green:") + 5; float labelWidth = std::max(StringWidth(red),
std::max(StringWidth(green), StringWidth(blue))) + 5;
rect.right = labelWidth + StringWidth("999") + 20; rect.right = labelWidth + StringWidth("999") + 20;
// red // red