FLTK: fix tab resizing

Author: chrisws

ChangeLog

@@ -1,5 +1,6 @@
-2019-12-13 (0.12.17)
+2019-12-15 (0.12.17)
 	FLTK: add online samples command
+	FLTK: fix tab resizing
 
 2019-12-07 (0.12.17)
 	FLTK: fix memory leaks

src/platform/fltk/FileWidget.cxx

@@ -101,8 +101,8 @@ static void anchorClick_cb(Fl_Widget *w, void *v) {
   }
 }
 
-FileWidget::FileWidget(Fl_Widget *rect) :
-  HelpWidget(rect),
+FileWidget::FileWidget(Fl_Widget *rect, int fontSize) :
+  HelpWidget(rect, fontSize),
   _saveEditorAs(0),
   _recentPaths(NULL) {
   callback(anchorClick_cb);

src/platform/fltk/FileWidget.h

@@ -14,7 +14,7 @@
 #include "platform/fltk/EditorWidget.h"
 
 struct FileWidget : public HelpWidget {
-  FileWidget(Fl_Widget *rect);
+  FileWidget(Fl_Widget *rect, int fontSize);
   ~FileWidget();
 
   static const char *forwardSlash(char *filename);

src/platform/fltk/HelpView.cxx

@@ -59,8 +59,8 @@ static void helpViewClick_cb(Fl_Widget *w, void *v) {
   Fl::add_check(helpViewClick_event);
 }
 
-HelpView::HelpView(Fl_Widget *rect) :
-  HelpWidget(rect),
+HelpView::HelpView(Fl_Widget *rect, int fontSize) :
+  HelpWidget(rect, fontSize),
   _openKeyword(-1),
   _openPackage(0) {
 }

src/platform/fltk/HelpView.h

@@ -14,7 +14,7 @@
 const char *getBriefHelp(const char *selection);
 
 struct HelpView : public HelpWidget {
-  HelpView(Fl_Widget *rect);
+  HelpView(Fl_Widget *rect, int fontSize);
   ~HelpView();
 
   void about();

src/platform/fltk/HelpWidget.cxx

@@ -1644,7 +1644,7 @@ static void anchor_callback(Fl_Widget *helpWidget, void *target) {
   ((HelpWidget *)helpWidget)->navigateTo((const char *)target);
 }
 
-HelpWidget::HelpWidget(Fl_Widget *rect, int defsize) :
+HelpWidget::HelpWidget(Fl_Widget *rect, int fontSize) :
   Fl_Group(rect->x(), rect->y(), rect->w(), rect->h()),
   background(BACKGROUND_COLOR),
   foreground(FOREGROUND_COLOR),
@@ -1675,7 +1675,7 @@ HelpWidget::HelpWidget(Fl_Widget *rect, int defsize) :
   callback(anchor_callback);    // default callback
   init();
   docHome.clear();
-  labelsize(defsize);
+  labelsize(fontSize);
 }
 
 HelpWidget::~HelpWidget() {
@@ -2657,18 +2657,6 @@ int HelpWidget::handle(int event) {
   }
 
   switch (event) {
-  case EVENT_INCREASE_FONT:
-    if (getFontSize() < MAX_FONT_SIZE) {
-      setFontSize(getFontSize() + 1);
-    }
-    return 1;
-
-  case EVENT_DECREASE_FONT:
-    if (getFontSize() > MIN_FONT_SIZE) {
-      setFontSize(getFontSize() - 1);
-    }
-    return 1;
-
   case EVENT_COPY_TEXT:
     copySelection();
     return 1;

src/platform/fltk/HelpWidget.h

@@ -33,8 +33,6 @@
 
 #define MIN_FONT_SIZE 11
 #define MAX_FONT_SIZE 22
-#define EVENT_INCREASE_FONT 100
-#define EVENT_DECREASE_FONT 101
 #define EVENT_COPY_TEXT     102
 #define EVENT_SEL_ALL_TEXT  103
 #define EVENT_FIND          104
@@ -52,7 +50,7 @@ struct ImageNode;
 
 class HelpWidget : public Fl_Group {
 public:
-  HelpWidget(Fl_Widget *rect, int defsize = MIN_FONT_SIZE);
+  HelpWidget(Fl_Widget *rect, int fontSize);
   virtual ~HelpWidget();
 
   void loadBuffer(const char *buffer);

src/platform/fltk/MainWindow.cxx

@@ -448,30 +448,18 @@ void MainWindow::copy_text(Fl_Widget *w, void *eventData) {
 }
 
 void MainWindow::font_size_incr(Fl_Widget *w, void *eventData) {
-  EditorWidget *editWidget = getEditor();
-  if (editWidget) {
-    int size = editWidget->getFontSize();
-    if (size < MAX_FONT_SIZE) {
-      editWidget->setFontSize(size + 1);
-      updateConfig(editWidget);
-      _runtime->setFontSize(size + 1);
-    }
-  } else {
-    handle(EVENT_INCREASE_FONT);
+  int size = _runtime->getFontSize();
+  if (size < MAX_FONT_SIZE) {
+    _runtime->setFontSize(size + 1);
+    resizeTabs(size + 1);
   }
 }
 
 void MainWindow::font_size_decr(Fl_Widget *w, void *eventData) {
-  EditorWidget *editWidget = getEditor();
-  if (editWidget) {
-    int size = editWidget->getFontSize();
-    if (size > MIN_FONT_SIZE) {
-      editWidget->setFontSize(size - 1);
-      updateConfig(editWidget);
-      _runtime->setFontSize(size - 1);
-    }
-  } else {
-    handle(EVENT_DECREASE_FONT);
+  int size = _runtime->getFontSize();
+  if (size > MIN_FONT_SIZE) {
+    _runtime->setFontSize(size - 1);
+    resizeTabs(size - 1);
   }
 }
 
@@ -1086,7 +1074,7 @@ void MainWindow::open_file(Fl_Widget *w, void *eventData) {
   Fl_Group *openFileGroup = findTab(gw_file);
   if (!openFileGroup) {
     openFileGroup = createTab(gw_file, fileTabName);
-    fileWidget = new FileWidget(_out);
+    fileWidget = new FileWidget(_out, _runtime->getFontSize());
     openFileGroup->resizable(fileWidget);
     openFileGroup->end();
     _tabGroup->end();
@@ -1142,7 +1130,7 @@ HelpView *MainWindow::getHelp() {
   Fl_Group *helpGroup = findTab(gw_help);
   if (!helpGroup) {
     helpGroup = createTab(gw_help, helpTabName);
-    help = new HelpView(_out);
+    help = new HelpView(_out, _runtime->getFontSize());
     help->callback(help_contents_anchor_cb);
     helpGroup->resizable(help);
     _profile->setHelpTheme(help);
@@ -1382,6 +1370,27 @@ void MainWindow::resizeDisplay(int x, int y, int w, int h) {
   _runtime->resize(w, h);
 }
 
+void MainWindow::resizeTabs(int fontSize) {
+  int n = _tabGroup->children();
+  for (int c = 0; c < n; c++) {
+    Fl_Group *group = (Fl_Group *)_tabGroup->child(c);
+    GroupWidgetEnum gw = getGroupWidget(group);
+    switch (gw) {
+    case gw_editor:
+      ((EditorWidget *)group->child(0))->setFontSize(fontSize);
+      break;
+    case gw_help:
+      ((HelpWidget *)group->child(0))->setFontSize(fontSize);
+      break;
+    case gw_file:
+      ((FileWidget *)group->child(0))->setFontSize(fontSize);
+      break;
+    default:
+      break;
+    }
+  }
+}
+
 /**
  * returns any active tty widget
  */

src/platform/fltk/MainWindow.h

@@ -80,6 +80,7 @@ struct MainWindow : public BaseWindow {
   void pathMessage(const char *file);
   void resize(int x, int y, int w, int h);
   void resizeDisplay(int x, int y, int w, int h);
+  void resizeTabs(int fontSize);
   void saveEditConfig(EditorWidget *editWidget);
   void scanPlugIns(Fl_Menu_Bar *menu);
   void scanRecentFiles(Fl_Menu_Bar *menu);

src/platform/fltk/Profile.cxx

@@ -38,7 +38,7 @@ Profile::Profile() :
   _loaded(false),
   _createBackups(true),
   _lineNumbers(true),
-  _fontSize(12),
+  _fontSize(DEF_FONT_SIZE),
   _indentLevel(2),
   _helpThemeId(0) {
   loadEditTheme(0);
@@ -111,6 +111,7 @@ void Profile::restore(MainWindow *wnd) {
     }
 
     restoreTabs(wnd, &profile);
+    wnd->_runtime->setFontSize(_fontSize);
   }
   _loaded = true;
 }