diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2015-01-19 20:50:06 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2015-01-19 20:50:06 +0000 |
| commit | 0c526662b33697f2ebb132b5018494ec699da27f (patch) | |
| tree | c62179c63d8a5f42e734806472d2e57840565a83 | |
| parent | e07bbbaaff19dfecbba3121616ac4a5b798cbc58 (diff) | |
| download | netsurf-0c526662b33697f2ebb132b5018494ec699da27f.tar.gz netsurf-0c526662b33697f2ebb132b5018494ec699da27f.tar.bz2 | |
Minor OS3 fixes
| -rw-r--r-- | amiga/gui.c | 12 | ||||
| -rwxr-xr-x | amiga/plotters.c | 4 |
2 files changed, 14 insertions, 2 deletions
diff --git a/amiga/gui.c b/amiga/gui.c index c533c7f65..534637bc4 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -3704,6 +3704,10 @@ gui_window_create(struct browser_window *bw, LOG(("Creating window object")); g->shared->objects[OID_MAIN] = WindowObject, +#ifndef __amigaos4__ + WA_Width, 100, + WA_Height, 100, +#endif WA_ScreenTitle, ami_gui_get_screen_title(), WA_Activate, TRUE, WA_DepthGadget, TRUE, @@ -5155,8 +5159,13 @@ Object *ami_gui_splash_open(void) struct TextFont *tfont; win_obj = WindowObject, - WA_Borderless, TRUE, +#ifdef __amigaos4__ WA_ToolBox, TRUE, +#else + WA_Width, 100, + WA_Height, 100, +#endif + WA_Borderless, TRUE, WA_BusyPointer, TRUE, WINDOW_Position, WPOS_CENTERSCREEN, WINDOW_LockWidth, TRUE, @@ -5381,6 +5390,7 @@ int main(int argc, char** argv) user = GetVar("user", temp, 1024, GVF_GLOBAL_ONLY); current_user = ASPrintf("%s", (user == -1) ? "Default" : temp); + LOG(("User: %s", current_user)); current_user_dir = ASPrintf("PROGDIR:Users/%s", current_user); if((lock = CreateDirTree(current_user_dir))) diff --git a/amiga/plotters.c b/amiga/plotters.c index 490d51955..f672e7a7b 100755 --- a/amiga/plotters.c +++ b/amiga/plotters.c @@ -118,7 +118,9 @@ void ami_init_layers(struct gui_globals *gg, ULONG width, ULONG height) } else { palette_mapped = false; } - +#ifndef __amigaos4__ + palette_mapped = true; /* only supporting palette mapped screens on OS3 for now */ +#endif if(!width) width = nsoption_int(redraw_tile_size_x); if(!height) height = nsoption_int(redraw_tile_size_y); |