X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-ui-constants.h;h=7ced3a4532cceb0dd4850e57b2c2adb5534d290f;hb=ca885ed046b02fd495ff07fbe4283c9692cfa442;hp=e2ebc62ca66b48354aaa7609e32319fe7a6559d0;hpb=d3647c5a35b790224b23c692c95aecebae2ede9b;p=modest diff --git a/src/widgets/modest-ui-constants.h b/src/widgets/modest-ui-constants.h index e2ebc62..7ced3a4 100644 --- a/src/widgets/modest-ui-constants.h +++ b/src/widgets/modest-ui-constants.h @@ -27,6 +27,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#ifdef MODEST_TOOLKIT_HILDON2 +#include +#endif #ifndef __MODEST_MAEMO_UI_CONSTANTS_H__ #define __MODEST_MAEMO_UI_CONSTANTS_H__ @@ -36,17 +39,24 @@ */ #ifndef MODEST_TOOLKIT_GTK -#define MODEST_MARGIN_DEFAULT 6 -#define MODEST_MARGIN_DOUBLE 12 -#define MODEST_MARGIN_TRIPLE 18 -#define MODEST_MARGIN_HALF 3 #define MODEST_MARGIN_NONE 0 -#define MODEST_DIALOG_WINDOW_MAX_HEIGHT 394 #define MODEST_DIALOG_WINDOW_MIN_HEIGHT 172 #define MODEST_DIALOG_WINDOW_MAX_WIDTH 642 #define MODEST_DIALOG_WINDOW_MIN_WIDTH 172 #ifdef MODEST_TOOLKIT_HILDON2 +#define MODEST_COMPACT_HEADER_BG "#404040" +#define MODEST_MARGIN_HALF HILDON_MARGIN_HALF +#define MODEST_MARGIN_DEFAULT HILDON_MARGIN_DEFAULT +#define MODEST_MARGIN_DOUBLE HILDON_MARGIN_DOUBLE +#define MODEST_MARGIN_TRIPLE HILDON_MARGIN_TRIPLE +#define MODEST_DIALOG_WINDOW_MAX_HEIGHT 345 #define MODEST_EDITABLE_SIZE (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH) +#else +#define MODEST_MARGIN_HALF 3 +#define MODEST_MARGIN_DEFAULT 6 +#define MODEST_MARGIN_DOUBLE 12 +#define MODEST_MARGIN_TRIPLE 18 +#define MODEST_DIALOG_WINDOW_MAX_HEIGHT 394 #endif #else /* MODEST_TOOLKIT_GTK */ /* TODO: review this values with GNOME HIG */