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

Ooops, fix the binary compatibility I introduced.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38592 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Philippe Houdoin
2010-09-09 16:33:56 +00:00
parent 7ae974066f
commit 62da9a0fce
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/interface/StringView.h
+1 -3
View File
@@ -78,11 +78,9 @@ private:
private: private:
char* fText; char* fText;
float fTextWidth; float fStringWidth;
alignment fAlign; alignment fAlign;
BSize fPreferredSize; BSize fPreferredSize;
uint32 _reserved[1];
}; };
#endif // _STRING_VIEW_H #endif // _STRING_VIEW_H
src/kits/interface/StringView.cpp
+10 -10
View File
@@ -29,7 +29,7 @@ BStringView::BStringView(BRect frame, const char* name, const char* text,
uint32 resizeMask, uint32 flags) uint32 resizeMask, uint32 flags)
: BView(frame, name, resizeMask, flags | B_FULL_UPDATE_ON_RESIZE), : BView(frame, name, resizeMask, flags | B_FULL_UPDATE_ON_RESIZE),
fText(text ? strdup(text) : NULL), fText(text ? strdup(text) : NULL),
fTextWidth(text ? StringWidth(text) : 0.0), fStringWidth(text ? StringWidth(text) : 0.0),
fAlign(B_ALIGN_LEFT), fAlign(B_ALIGN_LEFT),
fPreferredSize(-1, -1) fPreferredSize(-1, -1)
{ {
@@ -39,7 +39,7 @@ BStringView::BStringView(BRect frame, const char* name, const char* text,
BStringView::BStringView(const char* name, const char* text, uint32 flags) BStringView::BStringView(const char* name, const char* text, uint32 flags)
: BView(name, flags | B_FULL_UPDATE_ON_RESIZE), : BView(name, flags | B_FULL_UPDATE_ON_RESIZE),
fText(text ? strdup(text) : NULL), fText(text ? strdup(text) : NULL),
fTextWidth(text ? StringWidth(text) : 0.0), fStringWidth(text ? StringWidth(text) : 0.0),
fAlign(B_ALIGN_LEFT), fAlign(B_ALIGN_LEFT),
fPreferredSize(-1, -1) fPreferredSize(-1, -1)
{ {
@@ -49,7 +49,7 @@ BStringView::BStringView(const char* name, const char* text, uint32 flags)
BStringView::BStringView(BMessage* data) BStringView::BStringView(BMessage* data)
: BView(data), : BView(data),
fText(NULL), fText(NULL),
fTextWidth(0.0), fStringWidth(0.0),
fPreferredSize(-1, -1) fPreferredSize(-1, -1)
{ {
int32 align; int32 align;
@@ -244,11 +244,11 @@ BStringView::Draw(BRect updateRect)
float x; float x;
switch (fAlign) { switch (fAlign) {
case B_ALIGN_RIGHT: case B_ALIGN_RIGHT:
x = bounds.Width() - fTextWidth; x = bounds.Width() - fStringWidth;
break; break;
case B_ALIGN_CENTER: case B_ALIGN_CENTER:
x = (bounds.Width() - fTextWidth) / 2.0; x = (bounds.Width() - fStringWidth) / 2.0;
break; break;
default: default:
@@ -300,9 +300,9 @@ BStringView::SetText(const char* text)
free(fText); free(fText);
fText = text ? strdup(text) : NULL; fText = text ? strdup(text) : NULL;
float newTextWidth = StringWidth(fText); float newStringWidth = StringWidth(fText);
if (fTextWidth != newTextWidth) { if (fStringWidth != newStringWidth) {
fTextWidth = newTextWidth; fStringWidth = newStringWidth;
InvalidateLayout(); InvalidateLayout();
} }
@@ -352,7 +352,7 @@ BStringView::SetFont(const BFont* font, uint32 mask)
{ {
BView::SetFont(font, mask); BView::SetFont(font, mask);
fTextWidth = StringWidth(fText); fStringWidth = StringWidth(fText);
Invalidate(); Invalidate();
InvalidateLayout(); InvalidateLayout();
@@ -440,7 +440,7 @@ BStringView::_ValidatePreferredSize()
{ {
if (fPreferredSize.width < 0) { if (fPreferredSize.width < 0) {
// width // width
fPreferredSize.width = ceilf(fTextWidth); fPreferredSize.width = ceilf(fStringWidth);
// height // height
font_height fontHeight; font_height fontHeight;