diff options
| author | Ole Loots <ole@monochrom.net> | 2013-02-26 21:48:55 +0100 |
|---|---|---|
| committer | Ole Loots <ole@monochrom.net> | 2013-02-26 21:48:55 +0100 |
| commit | c4a8d472345471c5f8e0c6ba4b099987408a77c4 (patch) | |
| tree | 3c67ffd48d01fbc3359baab3153da475d9122202 /atari | |
| parent | 405fa12f8d5c63553276b3319625fd139fb65665 (diff) | |
| download | netsurf-c4a8d472345471c5f8e0c6ba4b099987408a77c4.tar.gz netsurf-c4a8d472345471c5f8e0c6ba4b099987408a77c4.tar.bz2 | |
Removed unused variable.
Diffstat (limited to 'atari')
| -rwxr-xr-x | atari/res/netsurf.rsm | 2 | ||||
| -rw-r--r-- | atari/toolbar.c | 19 |
2 files changed, 6 insertions, 15 deletions
diff --git a/atari/res/netsurf.rsm b/atari/res/netsurf.rsm index 189c6001f..2ede40593 100755 --- a/atari/res/netsurf.rsm +++ b/atari/res/netsurf.rsm @@ -3,7 +3,7 @@ ResourceMaster v3.65 #N 99@32@AZAaza___ _@AZAaza090___ _@@_@
#FoC-Header@rsm2out@C-Header@rsh@@@[C-Header@0@
#R 0@0@1@1@2@1@
-#M 20010100@0@7728@640@
+#M 20010100@0@7728@641@
#T 0@1@MAINMENU@@62@@
#O 4@32@T_FILE@@
#O 5@32@T_EDIT@@
diff --git a/atari/toolbar.c b/atari/toolbar.c index c8d8eed00..fad30561a 100644 --- a/atari/toolbar.c +++ b/atari/toolbar.c @@ -61,11 +61,6 @@ #define THROBBER_MAX_INDEX 12
#define THROBBER_INACTIVE_INDEX 13
-#define TOOLBAR_URL_MARGIN_LEFT 2
-#define TOOLBAR_URL_MARGIN_RIGHT 2 -#define TOOLBAR_URL_MARGIN_TOP 2 -#define TOOLBAR_URL_MARGIN_BOTTOM 2 -
enum e_toolbar_button_states {
button_on = 0,
button_off = 1
@@ -281,7 +276,6 @@ void toolbar_exit(void) struct s_toolbar *toolbar_create(struct s_gui_win_root *owner)
{
int i; - GRECT url_area; struct s_toolbar *t; LOG(("")); @@ -319,13 +313,10 @@ struct s_toolbar *toolbar_create(struct s_gui_win_root *owner) font_style_url.size = toolbar_styles[t->style].font_height_pt * FONT_SIZE_SCALE; - toolbar_get_grect(t, TOOLBAR_AREA_URL, &url_area); - url_area.g_h -= (TOOLBAR_URL_MARGIN_TOP + TOOLBAR_URL_MARGIN_BOTTOM); - - textarea_flags ta_flags = TEXTAREA_INTERNAL_CARET; textarea_setup ta_setup; + ta_setup.flags = TEXTAREA_INTERNAL_CARET; ta_setup.width = 300; - ta_setup.height = url_area.g_h; + ta_setup.height = t->form[TOOLBAR_AREA_URL].ob_height; ta_setup.pad_top = 0; ta_setup.pad_right = 4; ta_setup.pad_bottom = 0; @@ -587,7 +578,7 @@ void toolbar_set_dimensions(struct s_toolbar *tb, GRECT *area) /* this will request an textarea redraw: */ textarea_set_dimensions(tb->url.textarea, tb->form[TOOLBAR_AREA_URL].ob_width, - tb->form[TOOLBAR_AREA_URL].ob_height); + tb->form[TOOLBAR_AREA_URL].ob_height-1); } else { tb->area = *area; @@ -810,8 +801,8 @@ void toolbar_mouse_input(struct s_toolbar *tb, short obj, short button) window_process_redraws(tb->owner);
}
graf_mkstate( &mx, &my, &mb, &kstat );
- mx = mx - (work.g_x + TOOLBAR_URL_MARGIN_LEFT);
- my = my - (work.g_y + TOOLBAR_URL_MARGIN_TOP); + mx = mx - (work.g_x);
+ my = my - (work.g_y); } while (mb & 1); textarea_mouse_action( tb->url.textarea, BROWSER_MOUSE_HOVER, mx, |