* BControl::SetValue() now calls Invalidate() again - not doing so would
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:
@@ -581,10 +581,8 @@ BButton::DetachedFromWindow()
|
|||||||
void
|
void
|
||||||
BButton::SetValue(int32 value)
|
BButton::SetValue(int32 value)
|
||||||
{
|
{
|
||||||
if (value != Value()) {
|
if (value != Value())
|
||||||
BControl::SetValue(value);
|
BControl::SetValue(value);
|
||||||
Invalidate();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,28 +1,14 @@
|
|||||||
//------------------------------------------------------------------------------
|
/*
|
||||||
// Copyright (c) 2001-2002, OpenBeOS
|
* Copyright 2001-2006, Haiku Inc.
|
||||||
//
|
* Distributed under the terms of the MIT License.
|
||||||
// Permission is hereby granted, free of charge, to any person obtaining a
|
*
|
||||||
// copy of this software and associated documentation files (the "Software"),
|
* Authors:
|
||||||
// to deal in the Software without restriction, including without limitation
|
* Marc Flerackers ([email protected])
|
||||||
// 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:
|
/*! BCheckBox displays an on/off control. */
|
||||||
//
|
|
||||||
// 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 ([email protected])
|
|
||||||
// Description: BCheckBox displays an on/off control.
|
|
||||||
//------------------------------------------------------------------------------
|
|
||||||
#include <CheckBox.h>
|
#include <CheckBox.h>
|
||||||
#include <Window.h>
|
#include <Window.h>
|
||||||
|
|
||||||
@@ -43,7 +29,6 @@ BCheckBox::BCheckBox(BRect frame, const char *name, const char *label,
|
|||||||
|
|
||||||
BCheckBox::~BCheckBox()
|
BCheckBox::~BCheckBox()
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -350,7 +335,7 @@ void
|
|||||||
BCheckBox::SetValue(int32 value)
|
BCheckBox::SetValue(int32 value)
|
||||||
{
|
{
|
||||||
if (value != Value()) {
|
if (value != Value()) {
|
||||||
BControl::SetValue(value);
|
BControl::SetValueNoUpdate(value);
|
||||||
Invalidate(_CheckBoxFrame());
|
Invalidate(_CheckBoxFrame());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2001-2005, Haiku Inc.
|
* Copyright 2001-2006, Haiku Inc.
|
||||||
* Distributed under the terms of the MIT License.
|
* Distributed under the terms of the MIT License.
|
||||||
*
|
*
|
||||||
* Authors:
|
* Authors:
|
||||||
@@ -229,7 +229,7 @@ BColorControl::SetValue(int32 value)
|
|||||||
fBlueText->SetText(string);
|
fBlueText->SetText(string);
|
||||||
}
|
}
|
||||||
|
|
||||||
BControl::SetValue(value);
|
BControl::SetValueNoUpdate(value);
|
||||||
|
|
||||||
// TODO: This causes lot of flickering
|
// TODO: This causes lot of flickering
|
||||||
Invalidate();
|
Invalidate();
|
||||||
|
|||||||
@@ -1,37 +1,20 @@
|
|||||||
//------------------------------------------------------------------------------
|
/*
|
||||||
// Copyright (c) 2001-2005, Haiku
|
* Copyright 2001-2006, Haiku Inc.
|
||||||
//
|
* Distributed under the terms of the MIT License.
|
||||||
// Permission is hereby granted, free of charge, to any person obtaining a
|
*
|
||||||
// copy of this software and associated documentation files (the "Software"),
|
* Authors:
|
||||||
// to deal in the Software without restriction, including without limitation
|
* Marc Flerackers (mflerackers@androme.be)
|
||||||
// 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:
|
/*! BControl is the base class for user-event handling objects. */
|
||||||
//
|
|
||||||
// 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 ([email protected])
|
|
||||||
// Description: BControl is the base class for user-event handling objects.
|
|
||||||
//------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
#include <Control.h>
|
#include <Control.h>
|
||||||
#include <PropertyInfo.h>
|
#include <PropertyInfo.h>
|
||||||
#include <Window.h>
|
#include <Window.h>
|
||||||
#include <Errors.h>
|
|
||||||
#include <Debug.h>
|
|
||||||
|
|
||||||
#include <string.h>
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
|
||||||
static property_info sPropertyList[] = {
|
static property_info sPropertyList[] = {
|
||||||
@@ -308,6 +291,14 @@ BControl::Label() const
|
|||||||
|
|
||||||
void
|
void
|
||||||
BControl::SetValue(int32 value)
|
BControl::SetValue(int32 value)
|
||||||
|
{
|
||||||
|
fValue = value;
|
||||||
|
Invalidate();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void
|
||||||
|
BControl::SetValueNoUpdate(int32 value)
|
||||||
{
|
{
|
||||||
fValue = value;
|
fValue = value;
|
||||||
}
|
}
|
||||||
@@ -465,13 +456,6 @@ BControl::SetTracking(bool state)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
BControl::SetValueNoUpdate(int32 value)
|
|
||||||
{
|
|
||||||
fValue = value;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void BControl::_ReservedControl1() {}
|
void BControl::_ReservedControl1() {}
|
||||||
void BControl::_ReservedControl2() {}
|
void BControl::_ReservedControl2() {}
|
||||||
void BControl::_ReservedControl3() {}
|
void BControl::_ReservedControl3() {}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2001-2005, Haiku, Inc.
|
* Copyright 2001-2006, Haiku, Inc.
|
||||||
* Distributed under the terms of the MIT license.
|
* Distributed under the terms of the MIT license.
|
||||||
*
|
*
|
||||||
* Authors:
|
* Authors:
|
||||||
@@ -265,7 +265,7 @@ void
|
|||||||
BRadioButton::SetValue(int32 value)
|
BRadioButton::SetValue(int32 value)
|
||||||
{
|
{
|
||||||
if (value != Value()) {
|
if (value != Value()) {
|
||||||
BControl::SetValue(value);
|
BControl::SetValueNoUpdate(value);
|
||||||
Invalidate(_KnobFrame());
|
Invalidate(_KnobFrame());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2001-2005, Haiku.
|
* Copyright 2001-2006, Haiku.
|
||||||
* Distributed under the terms of the MIT License.
|
* Distributed under the terms of the MIT License.
|
||||||
*
|
*
|
||||||
* Authors:
|
* Authors:
|
||||||
@@ -621,8 +621,7 @@ BSlider::SetValue(int32 value)
|
|||||||
|
|
||||||
_SetLocation(loc);
|
_SetLocation(loc);
|
||||||
|
|
||||||
BControl::SetValue(value);
|
BControl::SetValueNoUpdate(value);
|
||||||
|
|
||||||
Invalidate(oldThumbFrame | ThumbFrame());
|
Invalidate(oldThumbFrame | ThumbFrame());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user