FLTK: fix startup size in run mode

Author: chrisws

src/platform/fltk/Profile.cxx

@@ -15,14 +15,14 @@
 
 const char *configFile = "config.txt";
 const char *pathKey = "path";
-const char *indentLevelKey = "_indentLevel";
+const char *indentLevelKey = "indentLevel";
 const char *fontNameKey = "fontName";
-const char *fontSizeKey = "_fontSize";
+const char *fontSizeKey = "fontSize";
 const char *windowPosKey = "windowPos";
 const char *activeTabKey = "activeTab";
-const char *createBackupsKey = "_createBackups";
-const char *lineNumbersKey = "_lineNumbers";
-const char *appPositionKey = "_appPosition";
+const char *createBackupsKey = "createBackups";
+const char *lineNumbersKey = "lineNumbers";
+const char *appPositionKey = "appPosition";
 
 // in BasicEditor.cxx
 extern TextDisplay::StyleTableEntry styletable[];

src/platform/fltk/dev_fltk.cxx

@@ -83,15 +83,12 @@ int osd_devinit() {
     int w = opt_pref_width + delta_x;
     int h = opt_pref_height + delta_y;
     wnd->_outputGroup->resize(w, h);
-    wnd->_out->resize(w, h);
+    wnd->_out->setStartSize(w, h);
   }
   // show the output-group in case it's the full-screen container. a possible
   // bug with fltk on x11 prevents resize after the window has been shown
   if (wnd->isInteractive() && !wnd->logPrint()) {
-    int w = wnd->_out->w();
-    int h = wnd->_out->h();
     wnd->_outputGroup->show();
-    wnd->_out->resize(w, h);
   }
 
   dev_fgcolor = -DEFAULT_FOREGROUND;

src/platform/fltk/display.cxx

@@ -218,7 +218,9 @@ DisplayWidget::DisplayWidget(int x, int y, int w, int h, int defsize) :
   _ansiWidget(NULL),
   _screen(NULL),
   _resized(false),
-  _defsize(defsize) {
+  _defsize(defsize),
+  _startW(-1),
+  _startH(-1) {
   drawColorRaw = DEFAULT_BACKGROUND;
   drawColor = maSetColor(drawColorRaw);
   widget = this;
@@ -231,6 +233,9 @@ DisplayWidget::~DisplayWidget() {
 
 void DisplayWidget::createScreen() {
   if (!_screen) {
+    if (_startW != -1 && _startH != -1) {
+      resize(_startW, _startH);
+    }
     _screen = new Canvas(_defsize);
     _screen->create(w(), h());
     _screen->_isScreen = true;

src/platform/fltk/display.h

@@ -60,6 +60,7 @@ class DisplayWidget : public fltk::Widget, IButtonListener {
   int  getY();
   void setPixel(int x, int y, int c);
   void setXY(int x, int y);
+  void setStartSize(int w, int h) { _startW=w; _startH=h; }
   int  textWidth(const char *s);
   int  textHeight(void);
   void setFontSize(float i);
@@ -83,6 +84,7 @@ class DisplayWidget : public fltk::Widget, IButtonListener {
   Canvas *_screen;
   bool _resized;
   int _defsize;
+  int _startW, _startH;
 };
 
 #endif

src/platform/fltk/sbasic.nsi

@@ -38,8 +38,11 @@
 ;--------------------------------
 ;Installer Sections
 
+RequestExecutionLevel admin
+
 ; Optional section (can be disabled by the user)
 Section "Start Menu Shortcut"
+  SetShellVarContext all
   CreateDirectory "$SMPROGRAMS\SmallBASIC 0.11.5"
   SetOutPath $INSTDIR
   CreateShortCut "$SMPROGRAMS\SmallBASIC 0.11.5\SmallBASIC.lnk" "$INSTDIR\sbasici.exe"
@@ -103,6 +106,7 @@ SectionEnd
 ;Uninstaller Section
 
 Section "Uninstall"
+  SetShellVarContext all
   ; Remove registry keys
   DeleteRegKey /ifempty HKCU "Software\SmallBASIC\FLTK_0.11.5"