Use global variable desk_area for size calculation

This commit is contained in:
Ole Loots 2012-12-06 00:27:57 +01:00
parent fa0326af43
commit 395f161eb5
2 changed files with 14 additions and 16 deletions

View File

@ -39,6 +39,7 @@
#include "atari/history.h"
extern char * tree_directory_icon_name;
extern GRECT desk_area;
struct s_atari_global_history gl_history;
@ -51,11 +52,11 @@ void global_history_open( void )
if( gl_history.open == false ) {
GRECT pos;
wind_get_grect(0, WF_FULLXYWH, &pos);
pos.g_x = pos.g_w - pos.g_w / 4;
pos.g_y = pos.g_y;
pos.g_w = pos.g_w / 4;
pos.g_h = pos.g_h;
wind_get_grect(0, WF_WORKXYWH, &pos);
pos.g_x = desk_area.g_w - desk_area.g_w / 4;
pos.g_y = desk_area.g_y;
pos.g_w = desk_area.g_w / 4;
pos.g_h = desk_area.g_h;
wind_open(guiwin_get_handle(gl_history.window), pos.g_x, pos.g_y,
pos.g_w, pos.g_h);
@ -103,10 +104,8 @@ bool global_history_init( void )
GRECT desk;
int flags = ATARI_TREEVIEW_WIDGETS;
wind_get_grect(0, WF_FULLXYWH, &desk);
gl_history.open = false;
handle = wind_create(flags, 40, 40, desk.g_w, desk.g_h);
handle = wind_create(flags, 40, 40, desk_area.g_w, desk_area.g_h);
gl_history.window = guiwin_add(handle, GW_FLAG_DEFAULTS, NULL);
if( gl_history.window == NULL ) {
LOG(("Failed to allocate history window"));

View File

@ -44,6 +44,8 @@
#include "atari/gemtk/gemtk.h"
#include "atari/res/netsurf.rsh"
extern GRECT desk_area;
struct atari_hotlist hl;
static short handle_event(GUIWIN *win, EVMULT_OUT *ev_out, short msg[8])
@ -115,9 +117,7 @@ void hotlist_init(void)
assert( tree );
hl.open = false;
wind_get_grect(0, WF_FULLXYWH, &desk);
handle = wind_create(flags, 0, 0, desk.g_w, desk.g_h);
handle = wind_create(flags, 0, 0, desk_area.g_w, desk_area.g_h);
hl.window = guiwin_add(handle, GW_FLAG_DEFAULTS, NULL);
if( hl.window == NULL ) {
LOG(("Failed to allocate Hotlist"));
@ -158,11 +158,10 @@ void hotlist_open(void)
if( hl.open == false ) {
GRECT pos;
wind_get_grect(0, WF_FULLXYWH, &pos);
pos.g_x = pos.g_w - pos.g_w / 4;
pos.g_y = pos.g_y;
pos.g_w = pos.g_w / 4;
pos.g_h = pos.g_h;
pos.g_x = desk_area.g_w - desk_area.g_w / 4;
pos.g_y = desk_area.g_y;
pos.g_w = desk_area.g_w / 4;
pos.g_h = desk_area.g_h;
wind_open_grect(guiwin_get_handle(hl.window), &pos);
hl.open = true;