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

When the window is already full screen (ie, zoomed, not the full-screen mode

Browse Source 
without any window border), do not enlarge or shrink the window when going from
or into tabbed mode. Fixes ticket #3646.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29822 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2009-03-31 13:37:04 +00:00
parent 8222443084
commit 80aabca188
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/terminal/SmartTabView.cpp
+14 -3
View File
@@ -163,11 +163,16 @@ SmartTabView::AddTab(BView *target, BTab *tab)
ContainerView()->MoveBy(0, TabHeight()); ContainerView()->MoveBy(0, TabHeight());
BScreen screen(Window()); BScreen screen(Window());
if (Window()->Frame().bottom + TabHeight() > screen.Frame().bottom - 5) if (Window()->DecoratorFrame().Height() + 2 * TabHeight()
< screen.Frame().Height()) {
if (Window()->Frame().bottom + TabHeight()
> screen.Frame().bottom - 5) {
Window()->MoveBy(0, -TabHeight()); Window()->MoveBy(0, -TabHeight());
}
Window()->ResizeBy(0, TabHeight()); Window()->ResizeBy(0, TabHeight());
} }
}
Invalidate(TabFrame(CountTabs() - 1).InsetByCopy(-2, -2)); Invalidate(TabFrame(CountTabs() - 1).InsetByCopy(-2, -2));
} }
@@ -177,11 +182,17 @@ BTab *
SmartTabView::RemoveTab(int32 index) SmartTabView::RemoveTab(int32 index)
{ {
if (CountTabs() == 2) { if (CountTabs() == 2) {
// see above // see AddTab()
BScreen screen(Window()); BScreen screen(Window());
if (Window()->Frame().bottom > screen.Frame().bottom - 5 - TabHeight()) if (Window()->DecoratorFrame().Height() + 2 * TabHeight()
< screen.Frame().Height()) {
if (Window()->Frame().bottom
> screen.Frame().bottom - 5 - TabHeight()) {
Window()->MoveBy(0, TabHeight()); Window()->MoveBy(0, TabHeight());
}
Window()->ResizeBy(0, -TabHeight()); Window()->ResizeBy(0, -TabHeight());
}
ContainerView()->MoveBy(0, -TabHeight()); ContainerView()->MoveBy(0, -TabHeight());
ContainerView()->ResizeBy(0, TabHeight()); ContainerView()->ResizeBy(0, TabHeight());
} }