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

* TabFrame() did not check if the index was valid. This should fix #5051.

Browse Source 
* Cleanup, removed commented code.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34346 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2009-11-29 12:06:13 +00:00
parent 783c4cd1fa
commit 9b606d42db
1 changed files with 14 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/TabView.cpp
+14 -33
View File
@@ -943,11 +943,13 @@ BTabView::DrawBox(BRect selTabRect)
EndLineArray(); EndLineArray();
} }
#define X_OFFSET 0.0f
BRect BRect
BTabView::TabFrame(int32 tab_index) const BTabView::TabFrame(int32 index) const
{ {
if (index >= CountTabs() || index < 0)
return BRect();
if (be_control_look != NULL) { if (be_control_look != NULL) {
float width = 100.0; float width = 100.0;
float height = fTabHeight;; float height = fTabHeight;;
@@ -955,12 +957,12 @@ BTabView::TabFrame(int32 tab_index) const
case B_WIDTH_FROM_LABEL: case B_WIDTH_FROM_LABEL:
{ {
float x = 0.0; float x = 0.0;
for (int32 i = 0; i < tab_index; i++){ for (int32 i = 0; i < index; i++){
x += StringWidth(TabAt(i)->Label()) + 20.0; x += StringWidth(TabAt(i)->Label()) + 20.0;
} }
return BRect(x, 0.0, return BRect(x, 0.0,
x + StringWidth(TabAt(tab_index)->Label()) + 20.0, x + StringWidth(TabAt(index)->Label()) + 20.0,
height); height);
} }
@@ -975,8 +977,7 @@ BTabView::TabFrame(int32 tab_index) const
case B_WIDTH_AS_USUAL: case B_WIDTH_AS_USUAL:
default: default:
return BRect(tab_index * width, 0.0, return BRect(index * width, 0.0, index * width + width, height);
tab_index * width + width, height);
} }
} }
@@ -985,20 +986,13 @@ BTabView::TabFrame(int32 tab_index) const
case B_WIDTH_FROM_LABEL: case B_WIDTH_FROM_LABEL:
{ {
float x = 6.0f; float x = 6.0f;
for (int32 i = 0; i < tab_index; i++){ for (int32 i = 0; i < index; i++){
x += StringWidth(TabAt(i)->Label()) + 20.0f; x += StringWidth(TabAt(i)->Label()) + 20.0f;
} }
return BRect(x - fTabOffset, 0.0f, return BRect(x - fTabOffset, 0.0f,
x - fTabOffset + StringWidth(TabAt(tab_index)->Label()) + 20.0f , fTabHeight); x - fTabOffset + StringWidth(TabAt(index)->Label()) + 20.0f,
fTabHeight);
/*float x = X_OFFSET;
for (int32 i = 0; i < tab_index; i++)
x += StringWidth(TabAt(i)->Label()) + 20.0f;
return BRect(x, 0.0f,
x + StringWidth(TabAt(tab_index)->Label()) + 20.0f, fTabHeight);*/
} }
case B_WIDTH_FROM_WIDEST: case B_WIDTH_FROM_WIDEST:
@@ -1010,27 +1004,14 @@ BTabView::TabFrame(int32 tab_index) const
if (tabWidth > width) if (tabWidth > width)
width = tabWidth; width = tabWidth;
} }
return BRect((6.0f + tab_index * width) - fTabOffset, 0.0f, return BRect((6.0f + index * width) - fTabOffset, 0.0f,
(6.0f + tab_index * width + width) - fTabOffset, fTabHeight); (6.0f + index * width + width) - fTabOffset, fTabHeight);
/*float width = 0.0f;
for (int32 i = 0; i < CountTabs(); i++) {
float tabWidth = StringWidth(TabAt(i)->Label()) + 20.0f;
if (tabWidth > width)
width = tabWidth;
}
return BRect(X_OFFSET + tab_index * width, 0.0f,
X_OFFSET + tab_index * width + width, fTabHeight);*/
} }
case B_WIDTH_AS_USUAL: case B_WIDTH_AS_USUAL:
default: default:
return BRect((6.0f + tab_index * 100.0f) - fTabOffset, 0.0f, return BRect((6.0f + index * 100.0f) - fTabOffset, 0.0f,
(6.0f + tab_index * 100.0f + 100.0f) - fTabOffset, fTabHeight); (6.0f + index * 100.0f + 100.0f) - fTabOffset, fTabHeight);
/*return BRect(X_OFFSET + tab_index * 100.0f, 0.0f,
X_OFFSET + tab_index * 100.0f + 100.0f, fTabHeight);*/
} }
} }