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

Terminal: Add a tooltip when in fullscreen mode

Browse Source 
* When in full screen mode, add a tooltip with the window title,
and a keyboard shortcut hint so one knows how to get out of it.
Should help with #7356
* 80 column cleanup
This commit is contained in:
François Revol
2012-11-05 20:03:53 +01:00
parent 8ef01bd74e
commit ca0d271159
1 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/terminal/TermWindow.cpp
+24 -5
View File
@@ -77,6 +77,9 @@ using namespace BPrivate ; // BCharacterSet stuff
#undef B_TRANSLATION_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATION_CONTEXT "Terminal TermWindow" #define B_TRANSLATION_CONTEXT "Terminal TermWindow"
// actually an arrow
#define UTF8_ENTER "\xe2\x86\xb5"
// #pragma mark - TermViewContainerView // #pragma mark - TermViewContainerView
@@ -795,14 +798,17 @@ TermWindow::MessageReceived(BMessage *message)
float mbHeight = fMenuBar->Bounds().Height() + 1; float mbHeight = fMenuBar->Bounds().Height() + 1;
fSavedFrame = Frame(); fSavedFrame = Frame();
BScreen screen(this); BScreen screen(this);
for (int32 i = fTabView->CountTabs() - 1; i >=0 ; i--)
_TermViewAt(i)->ScrollBar()->ResizeBy(0, (B_H_SCROLL_BAR_HEIGHT - 1)); for (int32 i = fTabView->CountTabs() - 1; i >= 0 ; i--)
_TermViewAt(i)->ScrollBar()->ResizeBy(0,
(B_H_SCROLL_BAR_HEIGHT - 1));
fMenuBar->Hide(); fMenuBar->Hide();
fTabView->ResizeBy(0, mbHeight); fTabView->ResizeBy(0, mbHeight);
fTabView->MoveBy(0, -mbHeight); fTabView->MoveBy(0, -mbHeight);
fSavedLook = Look(); fSavedLook = Look();
// done before ResizeTo to work around a Dano bug (not erasing the decor) // done before ResizeTo to work around a Dano bug
// (not erasing the decor)
SetLook(B_NO_BORDER_WINDOW_LOOK); SetLook(B_NO_BORDER_WINDOW_LOOK);
ResizeTo(screen.Frame().Width()+1, screen.Frame().Height()+1); ResizeTo(screen.Frame().Width()+1, screen.Frame().Height()+1);
MoveTo(screen.Frame().left, screen.Frame().top); MoveTo(screen.Frame().left, screen.Frame().top);
@@ -812,8 +818,11 @@ TermWindow::MessageReceived(BMessage *message)
_ActiveTermView()->DisableResizeView(); _ActiveTermView()->DisableResizeView();
float mbHeight = fMenuBar->Bounds().Height() + 1; float mbHeight = fMenuBar->Bounds().Height() + 1;
fMenuBar->Show(); fMenuBar->Show();
for (int32 i = fTabView->CountTabs() - 1; i >=0 ; i--)
_TermViewAt(i)->ScrollBar()->ResizeBy(0, -(B_H_SCROLL_BAR_HEIGHT - 1)); for (int32 i = fTabView->CountTabs() - 1; i >= 0 ; i--)
_TermViewAt(i)->ScrollBar()->ResizeBy(0,
-(B_H_SCROLL_BAR_HEIGHT - 1));
ResizeTo(fSavedFrame.Width(), fSavedFrame.Height()); ResizeTo(fSavedFrame.Width(), fSavedFrame.Height());
MoveTo(fSavedFrame.left, fSavedFrame.top); MoveTo(fSavedFrame.left, fSavedFrame.top);
fTabView->ResizeBy(0, -mbHeight); fTabView->ResizeBy(0, -mbHeight);
@@ -1648,6 +1657,16 @@ TermWindow::_UpdateSessionTitle(int32 index)
fTitle.title = windowTitle; fTitle.title = windowTitle;
SetTitle(fTitle.title); SetTitle(fTitle.title);
} }
// If fullscreen, add a tooltip with the title and a keyboard shortcut hint
if (fFullScreen) {
BString toolTip(fTitle.title);
toolTip += "\n(";
toolTip += B_TRANSLATE("Full screen");
toolTip += " (ALT " UTF8_ENTER "))";
termView->SetToolTip(toolTip.String());
} else
termView->SetToolTip((const char *)NULL);
} }