From 26cc21c5c078f411d3b08d71b27e49f0f55a832a Mon Sep 17 00:00:00 2001 From: Ole Loots Date: Thu, 10 Jan 2013 01:31:36 +0100 Subject: Fixed WM_FULLED handling --- atari/gemtk/gemtk.h | 4 ++++ atari/gemtk/guiwin.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/atari/gemtk/gemtk.h b/atari/gemtk/gemtk.h index bc84ed073..2bd3553f5 100644 --- a/atari/gemtk/gemtk.h +++ b/atari/gemtk/gemtk.h @@ -128,7 +128,11 @@ short msg_box_show(short type, const char * msg); #define GUIWIN_WM_FORM 1001 struct gui_window_s; + +/** list struct for managing AES windows */ typedef struct gui_window_s GUIWIN; + +/** GUIWIN event handler */ typedef short (*guiwin_event_handler_f)(GUIWIN *gw, EVMULT_OUT *ev_out, short msg[8]); struct guiwin_scroll_info_s { diff --git a/atari/gemtk/guiwin.c b/atari/gemtk/guiwin.c index 8d75c332f..150e5a4b2 100644 --- a/atari/gemtk/guiwin.c +++ b/atari/gemtk/guiwin.c @@ -224,7 +224,7 @@ static short preproc_wm(GUIWIN * gw, EVMULT_OUT *ev_out, short msg[8]) break; case WM_FULLED: - wind_get_grect(gw->handle, WF_FULLXYWH, &g); + wind_get_grect(DESKTOP_HANDLE, WF_WORKXYWH, &g); wind_get_grect(gw->handle, WF_CURRXYWH, &g2); if(g.g_w == g2.g_w && g.g_h == g2.g_h) { wind_get_grect(gw->handle, WF_PREVXYWH, &g); @@ -716,7 +716,7 @@ void guiwin_scroll(GUIWIN *win, short orientation, int units, bool refresh) int abs_pix = 0; GRECT *redraw=NULL, g, g_ro; - guiwin_get_grectw(win, GUIWIN_AREA_CONTENT, &g); + guiwin_get_grect(win, GUIWIN_AREA_CONTENT, &g); g_ro = g; if (orientation == GUIWIN_VSLIDER) { @@ -732,7 +732,7 @@ void guiwin_scroll(GUIWIN *win, short orientation, int units, bool refresh) if(oldpos == newpos) return; - if (units>=vis_units || guiwin_has_intersection(gw, &g_ro)) { + if (units>=vis_units || guiwin_has_intersection(win, &g_ro)) { // send complete redraw redraw = &g_ro; } else { @@ -768,7 +768,7 @@ void guiwin_scroll(GUIWIN *win, short orientation, int units, bool refresh) if(oldpos == newpos) return; - if (units>=vis_units || guiwin_has_intersection(gw, &g_ro)) { + if (units>=vis_units || guiwin_has_intersection(win, &g_ro)) { // send complete redraw redraw = &g_ro; } else { -- cgit v1.2.3