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

Patch from Ioan Molnar:

Browse Source 
If a Tab is partially out of the window, clicking on it to make it the 
active tab will scroll it to be completely visible.
The best solution would probably be having a way to scroll through the 
whole list of tabs, or something like this. But for now, at least, makes 
the tabbed terminal a bit more useful.
Thanks!



git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22325 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini 2007-09-27 08:26:15 +00:00
parent 6d523548f1
commit e96b202311
2 changed files with 58 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
headers/os/interface/TabView.h
View File

@ -203,8 +203,9 @@ virtual void _ReservedTabView12();
float fTabHeight;
int32 fSelection;
int32 fInitialSelection;
int32 fFocus;
uint32 _reserved[12];
int32 fFocus;
float fTabOffset;
uint32 _reserved[11];
};

68
src/kits/interface/TabView.cpp
View File

@ -596,11 +596,26 @@ BTabView::Select(int32 index)
tab = TabAt(index);
if (tab && ContainerView()) {
if(index == 0)
fTabOffset = 0.0f;
tab->Select(ContainerView());
fSelection = index;
}
Invalidate();
if(index != 0 && !Bounds().Contains(TabFrame(index))){
if(!Bounds().Contains(TabFrame(index).LeftTop()))
fTabOffset += TabFrame(index).left - Bounds().left - 20.0f;
else
fTabOffset += TabFrame(index).right - Bounds().right + 20.0f;
Invalidate();
}
/*MakeFocus();
SetFocusTab(index, true);
FocusTab();*/
}
@ -624,26 +639,29 @@ void
BTabView::SetFocusTab(int32 tab, bool focused)
{
if (tab >= CountTabs())
return;
tab = 0;
if(tab < 0)
tab = CountTabs() -1;
if (focused) {
if (tab == fFocus)
return;
if (fFocus != -1){
TabAt(fFocus)->MakeFocus(false);
if(TabAt (fFocus) != NULL)
TabAt(fFocus)->MakeFocus(false);
Invalidate(TabFrame(fFocus));
}
if (tab != -1) {
if(TabAt(tab) != NULL){
TabAt(tab)->MakeFocus(true);
Invalidate(TabFrame(tab));
fFocus = tab;
}
fFocus = tab;
} else if (fFocus != -1) {
TabAt(fFocus)->MakeFocus(false);
Invalidate(TabFrame(fFocus));
// fFocus = -1;
fFocus = -1;
}
}
@ -749,18 +767,36 @@ BTabView::TabFrame(int32 tab_index) const
switch (fTabWidthSetting) {
case B_WIDTH_FROM_LABEL:
{
float x = X_OFFSET;
float x = 6.0f;
for (int32 i = 0; i < tab_index; i++){
x += StringWidth(TabAt(i)->Label()) + 20.0f;
}
return BRect(x - fTabOffset, 0.0f,
x - fTabOffset + StringWidth(TabAt(tab_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);
x + StringWidth(TabAt(tab_index)->Label()) + 20.0f, fTabHeight);*/
}
case B_WIDTH_FROM_WIDEST:
{
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((6.0f + tab_index * width) - fTabOffset, 0.0f,
(6.0f + tab_index * width + width) - fTabOffset, fTabHeight);
/*float width = 0.0f;
for (int32 i = 0; i < CountTabs(); i++) {
float tabWidth = StringWidth(TabAt(i)->Label()) + 20.0f;
@ -769,13 +805,15 @@ BTabView::TabFrame(int32 tab_index) const
}
return BRect(X_OFFSET + tab_index * width, 0.0f,
X_OFFSET + tab_index * width + width, fTabHeight);
X_OFFSET + tab_index * width + width, fTabHeight);*/
}
case B_WIDTH_AS_USUAL:
default:
return BRect(X_OFFSET + tab_index * 100.0f, 0.0f,
X_OFFSET + tab_index * 100.0f + 100.0f, fTabHeight);
return BRect((6.0f + tab_index * 100.0f) - fTabOffset, 0.0f,
(6.0f + tab_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);*/
}
}
@ -850,9 +888,12 @@ BTabView::RemoveTab(int32 index)
if (index <= fSelection && fSelection != 0)
fSelection--;
Select(fSelection);
if(CountTabs() == 0)
fFocus = -1;
else
Select(fSelection);
if (fFocus == CountTabs() - 1)
if (fFocus == CountTabs() - 1 || CountTabs() == 0)
SetFocusTab(fFocus, false);
else
SetFocusTab(fFocus, true);
@ -939,6 +980,7 @@ BTabView::_InitObject()
fTabWidthSetting = B_WIDTH_AS_USUAL;
fSelection = 0;
fFocus = -1;
fTabOffset = 0.0f;
rgb_color color = ui_color(B_PANEL_BACKGROUND_COLOR);