- some more menu cleanup

- added text_draw_align()
- cleaned up ALIGN types

SVN-Revision: 307

diff --git a/src/leveleditor.cpp b/src/leveleditor.cpp
index ac8c411..aa6ce14 100644 (file)
--- a/src/leveleditor.cpp
+++ b/src/leveleditor.cpp
@@ -801,7 +801,7 @@ void le_drawinterface()
       button_panel_draw(&le_bad_panel);
 
       sprintf(str, "%d/%d", le_level,le_level_subset.levels);
-      text_drawf(&white_text, str, -8, 16, A_RIGHT, A_NONE, 1, NO_UPDATE);
+      text_drawf(&white_text, str, -8, 16, A_RIGHT, A_TOP, 1, NO_UPDATE);
 
       text_draw(&white_small_text, "F1 for Help", 10, 430, 1, NO_UPDATE);
     }

diff --git a/src/menu.cpp b/src/menu.cpp
index d7c939e..a534fa6 100644 (file)
--- a/src/menu.cpp
+++ b/src/menu.cpp
@@ -264,31 +264,32 @@ void menu_draw_item(menu_type* pmenu,
                     int menu_width, 
                     int menu_height)
 {
+  int font_width  = 16;
+
   const menu_item_type& pitem =  pmenu->item[index];
 
-  int arrange = 0;
+  int x_pos = 0;
   if(pmenu->arrange_left == YES)
-    arrange = ((menu_width - 48) + (16 * (strlen(pitem.text) 
-                                          + strlen(pitem.input)
-                                          + strlen(string_list_active(pitem.list)))))/2;
-  
-  int f = 0;
+    x_pos = 24 - menu_width/2
+      + (font_width * (strlen(pitem.text) 
+               + strlen(pitem.input)
+               + strlen(string_list_active(pitem.list))))/2;
+      
+  int effect_offset = 0;
   {
     int effect_time = 0;
     if(timer_check(&pmenu->effect))
       effect_time = timer_get_left(&pmenu->effect) / 4;
 
-    f = (index % 2) ? effect_time : -effect_time;
+    effect_offset = (index % 2) ? effect_time : -effect_time;
   }
 
-  int x_pos = screen->w/2 - menu_width/2;
-  int y_pos = index * 24 - menu_height/2;
-
-  int start_x    = screen->w/2 + arrange;
-  int center_y   = screen->h /2;
+  int raw_y_pos  = 24*index - menu_height/2; 
+  int top        = raw_y_pos + effect_offset;
+  int bottom     = top + 10; // bottom of the menu item 
 
-  int cen_y      = center_y + y_pos;
-  int cen_y_10_f = 10 + f + cen_y;
+  int start_x    = screen->w/2 + x_pos;
+  int cen_y_10_f = screen->h/2 + bottom;
 
   int shadow_size = 2;
   text_type* text_font = &white_text;
@@ -303,18 +304,20 @@ void menu_draw_item(menu_type* pmenu,
     case MN_DEACTIVE:
       {
         text_drawf(&black_text, pitem.text, 
-                   arrange, y_pos + 10 + f,
+                   x_pos, bottom,
                    A_HMIDDLE, A_VMIDDLE, 2);
         break;
       }
 
     case MN_HL:
       {
+        int x = screen->w/2 - menu_width/2; 
+        int y = screen->h/2 + raw_y_pos;
         /* Draw a horizontal line with a little 3d effect */
-        fillrect(x_pos, cen_y + 6,
+        fillrect(x, y + 6,
                  menu_width, 4,
                  210,50,50,225);
-        fillrect(x_pos, 10 + cen_y + 6, 
+        fillrect(x, y + 10 + 6, 
                  menu_width, 2,
                  0,0,0,255);
         break;
@@ -322,37 +325,37 @@ void menu_draw_item(menu_type* pmenu,
     case MN_LABEL:
       {
         text_drawf(&white_big_text, pitem.text, 
-                   arrange, y_pos + 10,
+                   x_pos, bottom,
                    A_HMIDDLE, A_VMIDDLE, 2);
         break;
       }
     case MN_TEXTFIELD:
     case MN_NUMFIELD:
       {
-        int input_pos = ((strlen(pitem.input)*16)/2);
-        int text_pos  = ((strlen(pitem.text) + 1)*16)/2;
+        int input_pos = (strlen(pitem.input)*font_width)/2;
+        int text_pos  = (strlen(pitem.text)+1)*font_width/2;
 
         fillrect(start_x - input_pos + text_pos - 1, cen_y_10_f - 10,
-                 (strlen(pitem.input)+1)*16 + 2, 20,
+                 (strlen(pitem.input)+1)*font_width + 2, 20,
                  255,255,255,255);
         fillrect(start_x - input_pos + text_pos, cen_y_10_f - 9,
-                 (strlen(pitem.input)+1)*16, 18,
+                 (strlen(pitem.input)+1)*font_width, 18,
                  0,0,0,128);
 
         text_drawf(&gold_text, pitem.input,
-                   arrange + text_pos, 10 + f + y_pos, 
+                   x_pos + text_pos, bottom, 
                    A_HMIDDLE, A_VMIDDLE, 2);
 
         text_drawf(text_font, pitem.text, 
-                   arrange - (((strlen(pitem.input)+1) * 16)/2), y_pos + 10 + f,
+                   x_pos - (((strlen(pitem.input)+1) * font_width)/2), bottom,
                    A_HMIDDLE, A_VMIDDLE, shadow_size);
         break;
       }
     case MN_STRINGSELECT:
       {
-        int list_pos_2 = (strlen(string_list_active(pitem.list))+1)*16;
-        int list_pos   = (strlen(string_list_active(pitem.list))*16)/2;
-        int text_pos   = ((strlen(pitem.text) + 1)*16)/2;
+        int list_pos_2 = (strlen(string_list_active(pitem.list))+1)*font_width;
+        int list_pos   = (strlen(string_list_active(pitem.list))*font_width)/2;
+        int text_pos   = ((strlen(pitem.text) + 1)*font_width)/2;
 
         /* Draw arrows */
         texture_draw(&arrow_left,  start_x - list_pos + text_pos - 17, cen_y_10_f - 8);
@@ -367,26 +370,26 @@ void menu_draw_item(menu_type* pmenu,
                  0,0,0,128);
 
         text_drawf(&gold_text, string_list_active(pitem.list), 
-                   arrange + text_pos, 10 + f + y_pos,
+                   x_pos + text_pos, bottom,
                    A_HMIDDLE, A_VMIDDLE,2);
 
         text_drawf(text_font, pitem.text,
-                   arrange - list_pos_2/2, 10 + f + y_pos,
+                   x_pos - list_pos_2/2, bottom,
                    A_HMIDDLE, A_VMIDDLE, shadow_size);
         break;
       }
     case MN_BACK:
       {
-        texture_draw(&back, start_x + (strlen(pitem.text) * 16)/2  + 16, cen_y_10_f - 8);
+        texture_draw(&back, start_x + (strlen(pitem.text) * font_width)/2  + font_width, cen_y_10_f - 8);
         break;
       }
 
     case MN_TOGGLE:
       {
         if(pitem.toggled == YES)
-          texture_draw(&checkbox_checked, start_x + (strlen(pitem.text) * 16)/2 + 16, cen_y_10_f - 8);
+          texture_draw(&checkbox_checked, start_x + (strlen(pitem.text) * font_width)/2 + font_width, cen_y_10_f - 8);
         else
-          texture_draw(&checkbox, start_x + (strlen(pitem.text) * 16)/2 + 16, cen_y_10_f - 8);
+          texture_draw(&checkbox, start_x + (strlen(pitem.text) * font_width)/2 + font_width, cen_y_10_f - 8);
         break;
       }
     case MN_ACTION:
@@ -402,7 +405,7 @@ void menu_draw_item(menu_type* pmenu,
     case MN_GOTO:
     case MN_TOGGLE:
     case MN_BACK:
-      text_drawf(text_font, pitem.text, arrange, 10 + f + y_pos, A_HMIDDLE, A_VMIDDLE, shadow_size);
+      text_drawf(text_font, pitem.text, x_pos, bottom, A_HMIDDLE, A_VMIDDLE, shadow_size);
       break;
     case MN_DEACTIVE:
     case MN_TEXTFIELD:
@@ -434,7 +437,7 @@ void menu_draw(menu_type* pmenu)
         }
     }
 
-  menu_width = menu_width * 16 + 48;
+  menu_width  = menu_width * 16 + 48;
   menu_height = (pmenu->num_items) * 24;
 
   int center_x = screen->w/2;

diff --git a/src/text.cpp b/src/text.cpp
index 9b3dee2..1403651 100644 (file)
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -115,7 +115,43 @@ void text_draw_chars(text_type* ptext, texture_type* pchars,const  char* text, i
     }
 }
 
-void text_drawf(text_type* ptext,const  char* text, int x, int y, int halign, int valign, int shadowsize, int update)
+void text_draw_align(text_type* ptext, const char* text, int x, int y,
+                     TextHAlign halign, TextVAlign valign, int shadowsize, int update)
+{
+  if(text != NULL)
+    {
+      switch (halign)
+        {
+        case A_RIGHT:
+          x += -(strlen(text)*ptext->w);
+          break;
+        case A_HMIDDLE:
+          x += -((strlen(text)*ptext->w)/2);
+          break;
+        case A_LEFT:
+          // default
+          break;
+        }
+
+      switch (valign)
+        {
+        case A_BOTTOM:
+          y -= ptext->h;
+          break;
+          
+        case A_VMIDDLE:
+          y -= ptext->h/2;
+
+        case A_TOP:
+          // default
+          break;
+        }
+
+      text_draw(ptext,text,x,y,shadowsize,update);
+    }
+}
+
+void text_drawf(text_type* ptext,const  char* text, int x, int y, TextHAlign halign, TextVAlign valign, int shadowsize, int update)
 {
   if(text != NULL)
     {

diff --git a/src/text.h b/src/text.h
index e0d6a8a..0e8b995 100644 (file)
--- a/src/text.h
+++ b/src/text.h
@@ -32,20 +32,23 @@ enum {
    TEXT_NUM
 };
 
-enum {
+enum TextHAlign {
    A_LEFT,
    A_HMIDDLE,
    A_RIGHT,
+};
+
+enum TextVAlign {
    A_TOP,
    A_VMIDDLE,
    A_BOTTOM,
-   A_NONE
 };
 
 void text_load(text_type* ptext, const std::string& file, int kind, int w, int h);
-void text_draw(text_type* ptext, const char* text, int x, int y, int shadowsize, int update);
-void text_draw_chars(text_type* ptext, texture_type* pchars, const char* text, int x, int y, int update);
-void text_drawf(text_type* ptext, const char* text, int x, int y, int halign, int valign, int shadowsize, int update = NO_UPDATE);
+void text_draw(text_type* ptext, const char* text, int x, int y, int shadowsize, int update = NO_UPDATE);
+void text_draw_chars(text_type* ptext, texture_type* pchars, const char* text, int x, int y, int update = NO_UPDATE);
+void text_drawf(text_type* ptext, const char* text, int x, int y, TextHAlign halign, TextVAlign valign, int shadowsize, int update = NO_UPDATE);
+void text_draw_align(text_type* ptext, const char* text, int x, int y, TextHAlign halign, TextVAlign valign, int shadowsize, int update = NO_UPDATE);
 void text_free(text_type* ptext);
 void erasetext(text_type* ptext, const char * text, int x, int y, texture_type * surf, int update, int shadowsize);
 void erasecenteredtext(text_type* ptext, const char * text, int y, texture_type * surf, int update, int shadowsize);