Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* BControl::SetValue() now calls Invalidate() again - not doing so would

Browse Source 
break compatibility a bit too much (as this is a public class).
* Instead, we're now using the same mechanism as in Dano/Zeta, that is,
  we use BControl::SetValueNoUpdate() in the inherited classes.
* Minor cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16183 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2006-02-01 15:55:46 +00:00
parent 5376b695a4
commit a71c960755
6 changed files with 38 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/kits/interface/Button.cpp
View File

@ -581,10 +581,8 @@ BButton::DetachedFromWindow()
void
BButton::SetValue(int32 value)
{
if (value != Value()) {
if (value != Value())
BControl::SetValue(value);
Invalidate();
}
}

39
src/kits/interface/CheckBox.cpp
View File

@ -1,28 +1,14 @@
//------------------------------------------------------------------------------
// Copyright (c) 2001-2002, OpenBeOS
//
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
// and/or sell copies of the Software, and to permit persons to whom the
// Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
//
// File Name: CheckBox.cpp
// Author: Marc Flerackers (mflerackers@androme.be)
// Description: BCheckBox displays an on/off control.
//------------------------------------------------------------------------------
/*
* Copyright 2001-2006, Haiku Inc.
* Distributed under the terms of the MIT License.
*
* Authors:
* Marc Flerackers (mflerackers@androme.be)
*/
/*! BCheckBox displays an on/off control. */
#include <CheckBox.h>
#include <Window.h>
@ -43,7 +29,6 @@ BCheckBox::BCheckBox(BRect frame, const char *name, const char *label,
BCheckBox::~BCheckBox()
{
}
@ -350,7 +335,7 @@ void
BCheckBox::SetValue(int32 value)
{
if (value != Value()) {
BControl::SetValue(value);
BControl::SetValueNoUpdate(value);
Invalidate(_CheckBoxFrame());
}
}

4
src/kits/interface/ColorControl.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright 2001-2005, Haiku Inc.
* Copyright 2001-2006, Haiku Inc.
* Distributed under the terms of the MIT License.
*
* Authors:
@ -229,7 +229,7 @@ BColorControl::SetValue(int32 value)
fBlueText->SetText(string);
}
BControl::SetValue(value);
BControl::SetValueNoUpdate(value);
// TODO: This causes lot of flickering
Invalidate();

54
src/kits/interface/Control.cpp
View File

@ -1,37 +1,20 @@
//------------------------------------------------------------------------------
// Copyright (c) 2001-2005, Haiku
//
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
// and/or sell copies of the Software, and to permit persons to whom the
// Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
//
// File Name: Control.cpp
// Author: Marc Flerackers (mflerackers@androme.be)
// Description: BControl is the base class for user-event handling objects.
//------------------------------------------------------------------------------
/*
* Copyright 2001-2006, Haiku Inc.
* Distributed under the terms of the MIT License.
*
* Authors:
* Marc Flerackers (mflerackers@androme.be)
*/
/*! BControl is the base class for user-event handling objects. */
#include <Control.h>
#include <PropertyInfo.h>
#include <Window.h>
#include <Errors.h>
#include <Debug.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
static property_info sPropertyList[] = {
@ -308,6 +291,14 @@ BControl::Label() const
void
BControl::SetValue(int32 value)
{
fValue = value;
Invalidate();
}
void
BControl::SetValueNoUpdate(int32 value)
{
fValue = value;
}
@ -465,13 +456,6 @@ BControl::SetTracking(bool state)
}
void
BControl::SetValueNoUpdate(int32 value)
{
fValue = value;
}
void BControl::_ReservedControl1() {}
void BControl::_ReservedControl2() {}
void BControl::_ReservedControl3() {}

4
src/kits/interface/RadioButton.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright 2001-2005, Haiku, Inc.
* Copyright 2001-2006, Haiku, Inc.
* Distributed under the terms of the MIT license.
*
* Authors:
@ -265,7 +265,7 @@ void
BRadioButton::SetValue(int32 value)
{
if (value != Value()) {
BControl::SetValue(value);
BControl::SetValueNoUpdate(value);
Invalidate(_KnobFrame());
}

5
src/kits/interface/Slider.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright 2001-2005, Haiku.
* Copyright 2001-2006, Haiku.
* Distributed under the terms of the MIT License.
*
* Authors:
@ -621,8 +621,7 @@ BSlider::SetValue(int32 value)
_SetLocation(loc);
BControl::SetValue(value);
BControl::SetValueNoUpdate(value);
Invalidate(oldThumbFrame | ThumbFrame());
}
}