X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/e373bb53193b6cb1b383c5766a8205735028aafc..56ed4cf7fdc391717c35bd1d71520daaff01eb1b:/mac/macterm.c

diff --git a/mac/macterm.c b/mac/macterm.c
index 629d2543..23ac22a6 100644
--- a/mac/macterm.c
+++ b/mac/macterm.c
@@ -1,4 +1,4 @@
-/* $Id: macterm.c,v 1.20 2002/12/08 22:23:08 ben Exp $ */
+/* $Id: macterm.c,v 1.22 2002/12/09 23:26:52 ben Exp $ */
 /*
  * Copyright (c) 1999 Simon Tatham
  * Copyright (c) 1999, 2002 Ben Harris
@@ -219,6 +219,7 @@ static void mac_adjustsize(Session *s, int newrows, int newcols) {
     MoveControl(s->scrollbar, winwidth - 15, -1);
     SizeControl(s->scrollbar, 16, winheight - 13);
     ShowControl(s->scrollbar);
+    mac_drawgrowicon(s);
 }
 
 static void mac_initpalette(Session *s) {
@@ -1010,8 +1011,8 @@ void pre_paint(Session *s) {
     GDHandle gdh;
     Rect myrect, tmprect;
 
-    s->term->attr_mask = 0;
     if (HAVE_COLOR_QD()) {
+	s->term->attr_mask = 0;
 	SetPort(s->window);
 	myrect = (*s->window->visRgn)->rgnBBox;
 	LocalToGlobal((Point *)&myrect.top);
@@ -1025,7 +1026,8 @@ void pre_paint(Session *s) {
 		switch ((*(*gdh)->gdPMap)->pixelSize) {
 		  case 1:
 		    if (s->cfg.bold_colour)
-			s->term->attr_mask |= ~(ATTR_BOLD | ATTR_COLOURS);
+			s->term->attr_mask |= ~(ATTR_COLOURS |
+			    (s->cfg.bold_colour ? ATTR_BOLD : 0));
 		    break;
 		  case 2:
 		    s->term->attr_mask |= ~ATTR_COLOURS;
@@ -1037,7 +1039,7 @@ void pre_paint(Session *s) {
 	    }
 	}
     } else
-	s->term->attr_mask &= ~(ATTR_COLOURS |
+	s->term->attr_mask = ~(ATTR_COLOURS |
 			        (s->cfg.bold_colour ? ATTR_BOLD : 0));
 }