Merge pull request #3 from tinycorelinux/mike_rescaling

juanito: merge MikeL work for fltk-1.4

Author: juanitotc

Frame.C

@@ -102,10 +102,10 @@ class Frame : public Fl_Window {
   Desktop* desktop_;
 
   FrameButton close_button;
-  FrameButton iconize_button;
-  FrameButton max_h_button;
   FrameButton max_w_button;
   FrameButton min_w_button;
+  FrameButton max_h_button;
+  FrameButton iconize_button;
 
   int maximize_width();
   int maximize_height();

Frame.H

@@ -225,7 +225,7 @@ static void GrowShorter(void) { // Ctrl+Alt+PageDn
 	GrowFrame(0, -1);
 }
 
-static void ToggleVertMax(void) {// Ctrl+Alt+V
+void ToggleVertMax(void) {// Ctrl+Alt+V
 	static int nonmax_h = Fl::h() - 64;
 	static int nonmax_y = 32;
 	Frame* f = Frame::activeFrame();
@@ -240,7 +240,7 @@ static void ToggleVertMax(void) {// Ctrl+Alt+V
 	}
 }
 
-static void ToggleHorzMax(void) {// Ctrl+Alt+H
+void ToggleHorzMax(void) {// Ctrl+Alt+H
 	static int nonmax_w = Fl::w() - 64;
 	static int nonmax_x = 32;
 	Frame* f = Frame::activeFrame();

Hotkeys.C

@@ -88,7 +88,7 @@ frame_label_draw(const Fl_Label* o, int X, int Y, int W, int H, Fl_Align align)
 	fl_rectf(X+x+SCREEN_DX, Y+y+SCREEN_DX, w, h);
     }
   }
-  fl_font(o->font, o->size);
+  fl_font(o->font, TitleFontSz); // o->size);
   fl_color((Fl_Color)o->color);
   const char* l = f->label(); if (!l) l = "unnamed";
   // double any ampersands to turn off the underscores:
@@ -111,7 +111,7 @@ frame_label_measure(const Fl_Label* o, int& W, int& H)
   Frame* f = (Frame*)(o->value);
   if (window_deleted(f)) {W = MENU_ICON_W+3; H = MENU_ICON_H; return;}
   const char* l = f->label(); if (!l) l = "unnamed";
-  fl_font(o->font, o->size);
+  fl_font(o->font, TitleFontSz); // o->size);
   fl_measure(l, W, H);
   W += MENU_ICON_W+3;
   if (W > MAX_MENU_WIDTH) W = MAX_MENU_WIDTH;
@@ -124,15 +124,15 @@ frame_label_measure(const Fl_Label* o, int& W, int& H)
 static void
 label_draw(const Fl_Label* o, int X, int Y, int W, int H, Fl_Align align)
 {
-  fl_font(o->font, o->size);
+  fl_font(o->font, TitleFontSz); // o->size);
   fl_color((Fl_Color)o->color);
   fl_draw(o->value, X+MENU_ICON_W+3, Y, W-MENU_ICON_W-3, H, align);
 }
 
 static void
 label_measure(const Fl_Label* o, int& W, int& H)
 {
-  fl_font(o->font, o->size);
+  fl_font(o->font, TitleFontSz); // o->size);
   fl_measure(o->value, W, H);
   W += MENU_ICON_W+3;
   if (W > MAX_MENU_WIDTH) W = MAX_MENU_WIDTH;
@@ -289,7 +289,7 @@ init(Fl_Menu_Item& m, const char* data)
   m.labeltype(FL_NORMAL_LABEL);
   m.shortcut(0);
   m.labelfont(MENU_FONT_SLOT);
-  m.labelsize(MENU_FONT_SIZE);
+  m.labelsize(TitleFontSz); // MENU_FONT_SIZE);
   m.labelcolor(FL_FOREGROUND_COLOR);
 }