diff options
| -rwxr-xr-x | atari/bitmap.c | 1 | ||||
| -rw-r--r-- | atari/gemtk/guiwin.c | 16 | ||||
| -rwxr-xr-x | atari/rootwin.c | 15 |
3 files changed, 11 insertions, 21 deletions
diff --git a/atari/bitmap.c b/atari/bitmap.c index 10b5c8cfa..774f0e9c8 100755 --- a/atari/bitmap.c +++ b/atari/bitmap.c @@ -117,6 +117,7 @@ void * bitmap_create_ex( int w, int h, short bpp, int rowstride, unsigned int st bitmap->bpp = bpp; bitmap->resized = NULL; bitmap->rowstride = rowstride; + bitmap->opaque = true; } else { free(bitmap); bitmap=NULL; diff --git a/atari/gemtk/guiwin.c b/atari/gemtk/guiwin.c index 6b46d78dc..6275184be 100644 --- a/atari/gemtk/guiwin.c +++ b/atari/gemtk/guiwin.c @@ -26,8 +26,8 @@ #include "gemtk.h" -//#define DEBUG_PRINT(x) printf x -#define DEBUG_PRINT(x) +#define DEBUG_PRINT(x) printf x +//#define DEBUG_PRINT(x) struct gemtk_window_s { @@ -533,16 +533,18 @@ static short preproc_mu_keybd(GUIWIN * gw, EVMULT_OUT *ev_out, short msg[8]) */ static void std_toolbar_redraw(GUIWIN *gw, uint16_t msg, GRECT *clip) { - GRECT g; + GRECT g, tb_area; + + gemtk_wm_get_grect(gw, GEMTK_WM_AREA_TOOLBAR, &tb_area); assert(gw->toolbar); assert(gw->toolbar_idx >= 0); // Update object position: - gw->toolbar[gw->toolbar_idx].ob_x = clip->g_x; - gw->toolbar[gw->toolbar_idx].ob_y = clip->g_y; - gw->toolbar[gw->toolbar_idx].ob_width = clip->g_w; - gw->toolbar[gw->toolbar_idx].ob_height = clip->g_h; + gw->toolbar[gw->toolbar_idx].ob_x = tb_area.g_x; + gw->toolbar[gw->toolbar_idx].ob_y = tb_area.g_y; + gw->toolbar[gw->toolbar_idx].ob_width = tb_area.g_w; + gw->toolbar[gw->toolbar_idx].ob_height = tb_area.g_h; wind_get_grect(gw->handle, WF_FIRSTXYWH, &g); while (g.g_h > 0 || g.g_w > 0) { diff --git a/atari/rootwin.c b/atari/rootwin.c index 4b66510bc..28e327176 100755 --- a/atari/rootwin.c +++ b/atari/rootwin.c @@ -408,8 +408,6 @@ void window_open(ROOTWIN *rootwin, struct gui_window *gw, GRECT pos) window_update_back_forward(rootwin); window_set_focus(rootwin, BROWSER, rootwin->active_gui_window->browser); - - } void window_restore_active_gui_window(ROOTWIN *rootwin) @@ -838,13 +836,6 @@ static void window_redraw_content(ROOTWIN *rootwin, GRECT *content_area, struct rect redraw_area; GRECT content_area_rel; - if(bw->window->browser->reformat_pending) { - browser_window_reformat(bw, true, content_area->g_w, - content_area->g_h); - bw->window->browser->reformat_pending = false; - //return; - } - //dbg_grect("browser redraw, content area", content_area); //dbg_grect("browser redraw, content clip", clip); @@ -1438,11 +1429,7 @@ static void on_resized(ROOTWIN *rootwin) toolbar_set_width(rootwin->toolbar, work.g_w); if ( gw->browser->bw->current_content != NULL ) { - /* Reformat will happen when redraw is processed: */ - // TODO: call reformat directly, this was introduced because - // of bad AES knowledge, it's ok to call it directly here... - //printf("reformat......\n"); - rootwin->active_gui_window->browser->reformat_pending = true; + browser_window_reformat(gw->browser->bw, true, work.g_w, work.g_h); } } if (rootwin->loc.g_x != g.g_x || rootwin->loc.g_y != g.g_y) { |