no Invalidate in BControl::SetValue, I figure more controls need to be updated for this change

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12947 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2005-06-03 19:55:49 +00:00
parent 743a147353
commit 0c3344f4a1
6 changed files with 205 additions and 175 deletions
+2
View File
@@ -94,6 +94,8 @@ virtual void _ReservedCheckBox1();
virtual void _ReservedCheckBox2(); virtual void _ReservedCheckBox2();
virtual void _ReservedCheckBox3(); virtual void _ReservedCheckBox3();
BRect _CheckBoxFrame() const;
BCheckBox &operator=(const BCheckBox &); BCheckBox &operator=(const BCheckBox &);
bool fOutlined; bool fOutlined;
+3
View File
@@ -98,6 +98,9 @@ virtual void _ReservedRadioButton1();
virtual void _ReservedRadioButton2(); virtual void _ReservedRadioButton2();
BRadioButton &operator=(const BRadioButton &); BRadioButton &operator=(const BRadioButton &);
BRect _KnobFrame() const;
static BBitmap *sBitmaps[2][3]; static BBitmap *sBitmaps[2][3];
bool fOutlined; bool fOutlined;
+3
View File
@@ -376,7 +376,10 @@ void BButton::DetachedFromWindow()
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
void BButton::SetValue(int32 value) void BButton::SetValue(int32 value)
{ {
if (value != Value()) {
BControl::SetValue(value); BControl::SetValue(value);
Invalidate();
}
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
void BButton::GetPreferredSize(float *width, float *height) void BButton::GetPreferredSize(float *width, float *height)
+14 -2
View File
@@ -101,8 +101,7 @@ BCheckBox::Draw(BRect updateRect)
darken4 = tint_color(no_tint, B_DARKEN_4_TINT), darken4 = tint_color(no_tint, B_DARKEN_4_TINT),
darkenmax = tint_color(no_tint, B_DARKEN_MAX_TINT); darkenmax = tint_color(no_tint, B_DARKEN_MAX_TINT);
BRect rect(1.0f, 3.0f, (float)ceil(3.0f + fontHeight.ascent), BRect rect = _CheckBoxFrame();
(float)ceil(5.0f + fontHeight.ascent));
if (IsEnabled()) { if (IsEnabled()) {
// Filling // Filling
@@ -350,7 +349,10 @@ BCheckBox::DetachedFromWindow()
void void
BCheckBox::SetValue(int32 value) BCheckBox::SetValue(int32 value)
{ {
if (value != Value()) {
BControl::SetValue(value); BControl::SetValue(value);
Invalidate(_CheckBoxFrame());
}
} }
@@ -452,3 +454,13 @@ BCheckBox::operator=(const BCheckBox &)
{ {
return *this; return *this;
} }
// _CheckBoxFrame
BRect
BCheckBox::_CheckBoxFrame() const
{
font_height fh;
GetFontHeight(&fh);
return BRect(1.0f, 3.0f, ceilf(3.0f + fh.ascent), ceilf(5.0f + fh.ascent));
}
-8
View File
@@ -309,15 +309,7 @@ BControl::Label() const
void void
BControl::SetValue(int32 value) BControl::SetValue(int32 value)
{ {
if (fValue == value)
return;
fValue = value; fValue = value;
if (Window()) {
Invalidate(Bounds());
Flush();
}
} }
+26 -8
View File
@@ -73,17 +73,10 @@ void BRadioButton::Draw(BRect updateRect)
GetFontHeight(&fh); GetFontHeight(&fh);
// layout the rect for the dot // layout the rect for the dot
BRect rect(Bounds()); BRect rect = _KnobFrame();
// its size depends on the text height // its size depends on the text height
float textHeight = floorf(fh.ascent + fh.descent + 0.5); float textHeight = floorf(fh.ascent + fh.descent + 0.5);
float inset = -floorf(textHeight / 2 - 2);
rect.left -= (inset - 1);
rect.top = floorf((rect.top + rect.bottom) / 2.0);
rect.bottom = rect.top;
rect.right = rect.left;
rect.InsetBy(inset, inset);
BPoint labelPos(rect.right + floorf(textHeight / 2.0), BPoint labelPos(rect.right + floorf(textHeight / 2.0),
floorf((rect.top + rect.bottom + textHeight) / 2.0 - fh.descent + 0.5) + 1.0); floorf((rect.top + rect.bottom + textHeight) / 2.0 - fh.descent + 0.5) + 1.0);
@@ -302,7 +295,10 @@ void BRadioButton::KeyDown(const char *bytes, int32 numBytes)
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
void BRadioButton::SetValue(int32 value) void BRadioButton::SetValue(int32 value)
{ {
if (value != Value()) {
BControl::SetValue(value); BControl::SetValue(value);
Invalidate(_KnobFrame());
}
if (!value) if (!value)
return; return;
@@ -477,6 +473,28 @@ BRadioButton &BRadioButton::operator=(const BRadioButton &)
return *this; return *this;
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
BRect
BRadioButton::_KnobFrame() const
{
font_height fh;
GetFontHeight(&fh);
// layout the rect for the dot
BRect rect(Bounds());
// its size depends on the text height
float textHeight = floorf(fh.ascent + fh.descent + 0.5);
float inset = -floorf(textHeight / 2 - 2);
rect.left -= (inset - 1);
rect.top = floorf((rect.top + rect.bottom) / 2.0);
rect.bottom = rect.top;
rect.right = rect.left;
rect.InsetBy(inset, inset);
return rect;
}
/* /*
* $Log $ * $Log $