diff options
author | Ole Loots <ole@monochrom.net> | 2012-04-10 23:12:13 +0000 |
---|---|---|
committer | Ole Loots <ole@monochrom.net> | 2012-04-10 23:12:13 +0000 |
commit | 786be41d01b1a2940aae1012dd9db128acee594d (patch) | |
tree | 54e1e2bf56b8e7a5f29d4e54a5cee1f331d77010 /atari/toolbar.h | |
parent | a94781edc034b60c72ea148e57f6f1cdc545377d (diff) | |
download | netsurf-786be41d01b1a2940aae1012dd9db128acee594d.tar.gz netsurf-786be41d01b1a2940aae1012dd9db128acee594d.tar.bz2 |
Initial support for (truecolor) image toolbar ( toolbar icons loaded from image file, not from resource ).
svn path=/trunk/netsurf/; revision=13848
Diffstat (limited to 'atari/toolbar.h')
-rwxr-xr-x | atari/toolbar.h | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/atari/toolbar.h b/atari/toolbar.h index 27bf4396f..32366f5c7 100755 --- a/atari/toolbar.h +++ b/atari/toolbar.h @@ -21,28 +21,30 @@ #include "desktop/textarea.h" #include "desktop/textinput.h" +#include "content/hlcache.h" #include "atari/browser.h"
#define TB_BUTTON_WIDTH 32
-#define TB_BUTTON_HEIGHT 21 /* includes 1px 3d effect */
-#define TOOLBAR_HEIGHT 25
#define THROBBER_WIDTH 32
#define THROBBER_MIN_INDEX 1
#define THROBBER_MAX_INDEX 12
#define THROBBER_INACTIVE_INDEX 13
-#define URLBOX_HEIGHT 21
-#define TOOLBAR_URL_TEXT_SIZE_PT 14 -#define TOOLBAR_TEXTAREA_HEIGHT 19 #define TOOLBAR_URL_MARGIN_LEFT 2
#define TOOLBAR_URL_MARGIN_RIGHT 2 #define TOOLBAR_URL_MARGIN_TOP 2 -#define TOOLBAR_URL_MARGIN_BOTTOM 2
+#define TOOLBAR_URL_MARGIN_BOTTOM 2 +
struct s_tb_button
{
short rsc_id;
void (*cb_click)(struct gui_window * gw);
- COMPONENT * comp;
+ const char * iconfile; + COMPONENT * comp; + OBJECT * aes_object; + hlcache_handle * icon; + struct gui_window * gw; + short index;
};
@@ -72,10 +74,15 @@ struct s_toolbar /* size & location of buttons: */ struct s_tb_button * buttons; bool hidden;
- int btcnt;
+ int btcnt; + int style; + bool redraw;
};
-/* interface to the toolbar */
+/* interface to the toolbar */ +
+/* Must be called before any other toolbar function is called: */ +void toolbar_init( void ); CMP_TOOLBAR tb_create( struct gui_window * gw );
void tb_destroy( CMP_TOOLBAR tb );
/* recalculate size/position of nested controls within the toolbar: */ @@ -88,7 +95,7 @@ void tb_forward_click( struct gui_window * gw ); void tb_home_click( struct gui_window * gw );
void tb_stop_click( struct gui_window * gw );
/* enable / disable buttons etc. */
-void tb_update_buttons( struct gui_window * gw );
+void tb_update_buttons( struct gui_window * gw, short buttonid );
/* handles clicks on url widget: */
void tb_url_click( struct gui_window * gw, short mx, short my, short mb, short kstat );
/* handle keybd event while url widget has focus:*/
|