1
0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-27 02:02:26 +00:00

Hide/show the scrollbar

[originally from svn r5230]
This commit is contained in:
Owen Dunn 2005-01-30 14:59:47 +00:00
parent bb787c53fb
commit ea225b5889
2 changed files with 15 additions and 8 deletions

View File

@ -181,7 +181,6 @@ static void mac_enddlg_reconfig(WindowPtr window, int value)
if (s->cfg.height != prev_cfg.height || if (s->cfg.height != prev_cfg.height ||
s->cfg.width != prev_cfg.width || s->cfg.width != prev_cfg.width ||
s->cfg.savelines != prev_cfg.savelines) { s->cfg.savelines != prev_cfg.savelines) {
term_size(s->term, s->cfg.height, s->cfg.width, s->cfg.savelines);
request_resize(s, s->cfg.width, s->cfg.height); request_resize(s, s->cfg.width, s->cfg.height);
} }
@ -189,7 +188,11 @@ static void mac_enddlg_reconfig(WindowPtr window, int value)
if (s->cfg.wintitle[0]) if (s->cfg.wintitle[0])
set_title(s, s->cfg.wintitle); set_title(s, s->cfg.wintitle);
/* TODO: zoom, scroll bar, font */ /* Scroll bar */
if (s->cfg.scrollbar != prev_cfg.scrollbar)
request_resize(s, s->cfg.width, s->cfg.height);
/* TODO: zoom, font */
} }
} }

View File

@ -324,14 +324,18 @@ void mac_pollterm(void)
*/ */
static void mac_adjustsize(Session *s, int newrows, int newcols) { static void mac_adjustsize(Session *s, int newrows, int newcols) {
int winwidth, winheight; int winwidth, winheight;
int extraforscroll;
winwidth = newcols * s->font_width + 15; extraforscroll=s->cfg.scrollbar ? 15 : 0;
winwidth = newcols * s->font_width + extraforscroll;
winheight = newrows * s->font_height; winheight = newrows * s->font_height;
SizeWindow(s->window, winwidth, winheight, true); SizeWindow(s->window, winwidth, winheight, true);
HideControl(s->scrollbar); if (s->cfg.scrollbar) {
MoveControl(s->scrollbar, winwidth - 15, -1); HideControl(s->scrollbar);
SizeControl(s->scrollbar, 16, winheight - 13); MoveControl(s->scrollbar, winwidth - extraforscroll, -1);
ShowControl(s->scrollbar); SizeControl(s->scrollbar, extraforscroll + 1, winheight - 13);
ShowControl(s->scrollbar);
}
mac_drawgrowicon(s); mac_drawgrowicon(s);
} }
@ -1043,7 +1047,7 @@ static void mac_activateterm(WindowPtr window, EventRecord *event)
s = mac_windowsession(window); s = mac_windowsession(window);
term_set_focus(s->term, active); term_set_focus(s->term, active);
term_update(s->term); term_update(s->term);
if (active) if (active && s->cfg.scrollbar)
ShowControl(s->scrollbar); ShowControl(s->scrollbar);
else { else {
if (HAVE_COLOR_QD()) if (HAVE_COLOR_QD())