src/window.cpp
branch0.6
changeset 10328 721fe18a2176
parent 9194 685d482d1e6c
equal deleted inserted replaced
10327:2274772a4424 10328:721fe18a2176
  2183 				top = w->top;
  2183 				top = w->top;
  2184 				if (top + (w->height >> 1) >= newh) top = newh - w->height;
  2184 				if (top + (w->height >> 1) >= newh) top = newh - w->height;
  2185 
  2185 
  2186 				const Window *wt = FindWindowById(WC_MAIN_TOOLBAR, 0);
  2186 				const Window *wt = FindWindowById(WC_MAIN_TOOLBAR, 0);
  2187 				if (wt != NULL) {
  2187 				if (wt != NULL) {
  2188 					if (top < wt->height) top = wt->height;
  2188 					if (top < wt->height && wt->left < (w->left + w->width) && (wt->left + wt->width) > w->left) top = wt->height;
  2189 					if (top >= newh) top = newh - 1;
  2189 					if (top >= newh) top = newh - 1;
  2190 				} else {
  2190 				} else {
  2191 					if (top < 0) top = 0;
  2191 					if (top < 0) top = 0;
  2192 				}
  2192 				}
  2193 			} break;
  2193 			} break;