Set modest standard margins in defines.

pmo-trunk-r7859

diff --git a/src/widgets/modest-ui-constants.h b/src/widgets/modest-ui-constants.h
index 084725e..82dd995 100644 (file)
--- 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 <hildon/hildon-defines.h>
+#endif
 
 #ifndef __MODEST_MAEMO_UI_CONSTANTS_H__
 #define __MODEST_MAEMO_UI_CONSTANTS_H__
@@ -36,18 +39,22 @@
  */
 
 #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_MIN_HEIGHT 172
 #define MODEST_DIALOG_WINDOW_MAX_WIDTH 642
 #define MODEST_DIALOG_WINDOW_MIN_WIDTH 172
 #ifdef MODEST_TOOLKIT_HILDON2
+#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 320
 #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 */