[haiku-commits] haiku: hrev43736 - src/kits/interface

From: fredrik.holmqvist@xxxxxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Sat, 11 Feb 2012 19:36:24 +0100 (CET)
hrev43736 adds 1 changeset to branch 'master'
old head: 37ea4f77f7b962a15fae36807d07b0821d0b7c0f
new head: 3e2017d24e3912c42e583a508caea971a195f666

----------------------------------------------------------------------------

3e2017d: Some cleanup in interface kit. From unused code warnings (before I 
updated buildtools).

                         [ Fredrik Holmqvist <fredrik.holmqvist@xxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev43736
Commit:      3e2017d24e3912c42e583a508caea971a195f666
URL:         http://cgit.haiku-os.org/haiku/commit/?id=3e2017d
Author:      Fredrik Holmqvist <fredrik.holmqvist@xxxxxxxxx>
Date:        Sat Feb 11 09:30:56 2012 UTC

----------------------------------------------------------------------------

4 files changed, 0 insertions(+), 30 deletions(-)
src/kits/interface/Button.cpp      |    1 -
src/kits/interface/StatusBar.cpp   |   18 ------------------
src/kits/interface/TextControl.cpp |    1 -
src/kits/interface/TextView.cpp    |   10 ----------

----------------------------------------------------------------------------

diff --git a/src/kits/interface/Button.cpp b/src/kits/interface/Button.cpp
index bd61259..b1fe074 100644
--- a/src/kits/interface/Button.cpp
+++ b/src/kits/interface/Button.cpp
@@ -177,7 +177,6 @@ BButton::Draw(BRect updateRect)
        rgb_color buttonBgColor = tint_color(panelBgColor, B_LIGHTEN_1_TINT);
        rgb_color lightColor;
        rgb_color maxLightColor;
-       rgb_color maxShadowColor = tint_color(panelBgColor, B_DARKEN_MAX_TINT);
 
        rgb_color dark1BorderColor;
        rgb_color dark2BorderColor;
diff --git a/src/kits/interface/StatusBar.cpp b/src/kits/interface/StatusBar.cpp
index 9faa8a4..b17062f 100644
--- a/src/kits/interface/StatusBar.cpp
+++ b/src/kits/interface/StatusBar.cpp
@@ -772,14 +772,7 @@ BStatusBar::_SetTextData(BString& text, const char* source,
        if (text == source)
                return;
 
-       float oldWidth;
-       if (rightAligned)
-               oldWidth = Bounds().right - fTextDivider;
-       else
-               oldWidth = fTextDivider;
-
        bool oldHasText = _HasText();
-
        text = source;
 
        BString newString;
@@ -788,17 +781,6 @@ BStatusBar::_SetTextData(BString& text, const char* source,
        else
                newString << combineWith << text;
 
-       float newWidth = ceilf(StringWidth(newString.String()));
-               // might still be smaller in Draw(), but we use it
-               // only for the invalidation rect here
-
-       // determine which part of the view needs an update
-       float invalidateWidth = max_c(newWidth, oldWidth);
-
-       float position = 0.0;
-       if (rightAligned)
-               position = Bounds().right - invalidateWidth;
-
        if (oldHasText != _HasText())
                InvalidateLayout();
 
diff --git a/src/kits/interface/TextControl.cpp 
b/src/kits/interface/TextControl.cpp
index b5025af..e2572c5 100644
--- a/src/kits/interface/TextControl.cpp
+++ b/src/kits/interface/TextControl.cpp
@@ -440,7 +440,6 @@ BTextControl::Draw(BRect updateRect)
        rgb_color noTint = ui_color(B_PANEL_BACKGROUND_COLOR);
        rgb_color lighten1 = tint_color(noTint, B_LIGHTEN_1_TINT);
        rgb_color lighten2 = tint_color(noTint, B_LIGHTEN_2_TINT);
-       rgb_color lightenMax = tint_color(noTint, B_LIGHTEN_MAX_TINT);
        rgb_color darken1 = tint_color(noTint, B_DARKEN_1_TINT);
        rgb_color darken2 = tint_color(noTint, B_DARKEN_2_TINT);
        rgb_color darken4 = tint_color(noTint, B_DARKEN_4_TINT);
diff --git a/src/kits/interface/TextView.cpp b/src/kits/interface/TextView.cpp
index 2ed32c4..696ff4c 100644
--- a/src/kits/interface/TextView.cpp
+++ b/src/kits/interface/TextView.cpp
@@ -3661,12 +3661,9 @@ BTextView::_HandleAlphaKey(const char *bytes, int32 
numBytes)
                undoBuffer->InputCharacter(numBytes);
        }
 
-       bool erase = fSelStart != fText->Length();
-
        if (fSelStart != fSelEnd) {
                Highlight(fSelStart, fSelEnd);
                DeleteText(fSelStart, fSelEnd);
-               erase = true;
        }
 
        if (fAutoindent && numBytes == 1 && *bytes == B_ENTER) {
@@ -3706,7 +3703,6 @@ BTextView::_Refresh(int32 fromOffset, int32 toOffset, 
bool scroll)
        int32 toLine = _LineAt(toOffset);
        int32 saveFromLine = fromLine;
        int32 saveToLine = toLine;
-       float saveLineHeight = LineHeight(fromLine);
 
        _RecalculateLineBreaks(&fromLine, &toLine);
 
@@ -3737,12 +3733,6 @@ BTextView::_Refresh(int32 fromOffset, int32 toOffset, 
bool scroll)
        fromLine = max_c(fromVisible, fromLine);
        toLine = min_c(toLine, toVisible);
 
-       int32 drawOffset = fromOffset;
-       if (LineHeight(fromLine) != saveLineHeight
-               || newHeight < saveHeight || fromLine < saveFromLine
-               || fAlignment != B_ALIGN_LEFT)
-               drawOffset = (*fLines)[fromLine]->offset;
-
        _AutoResize(false);
 
        _RequestDrawLines(fromLine, toLine);
[haiku-commits] haiku: hrev43736 - src/kits/interface

Other related posts:
