Fix up some styling issue type things.

Also fix crash when hiding, then showing tool tabs.
Small cleanups.

Author: wcjohns

CMakeLists.txt

@@ -2,7 +2,7 @@
 # excpet iOS, Android, and Electron, InterSpecExe
 
 cmake_policy(SET CMP0048 NEW)
-project(InterSpec VERSION 1.0.7)
+project(InterSpec VERSION 1.0.8)
 
 cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
 set(CMAKE_COLOR_MAKEFILE ON CACHE BOOL "Color" FORCE)
@@ -1035,7 +1035,7 @@ elseif(BUILD_AS_OSX_APP)
 
     #set MACOS_BUNDLE_VERSION_NUMBER for Info.plist.template to populate cooresponding value in Xcode
     #math(EXPR MACOS_BUNDLE_VERSION_NUMBER "100*(${PROJECT_VERSION_MAJOR}-1) + 10*${PROJECT_VERSION_MINOR} + ${PROJECT_VERSION_PATCH}" )
-    set(MACOS_BUNDLE_VERSION_NUMBER 8)
+    set(MACOS_BUNDLE_VERSION_NUMBER 9)
 
     set_target_properties(
         InterSpecExe

InterSpec/InterSpec.h

@@ -577,8 +577,6 @@ class InterSpec : public Wt::WContainerWidget
 
   void setToolTabsVisible( bool show );
   bool toolTabsVisible() const;
-
-  void setChartSpacing();
 
   void showMakeDrfWindow();
   void showDetectorEditWindow();
@@ -1196,7 +1194,7 @@ class InterSpec : public Wt::WContainerWidget
   Wt::WGridLayout        *m_layout;
 
   Wt::WContainerWidget   *m_charts;
-  Wt::WContainerWidget   *m_chartsResize;
+  Wt::WContainerWidget   *m_chartResizer;
   Wt::WGridLayout        *m_toolsLayout;
 #endif
 

InterSpec/SpectrumDataModel.h

@@ -80,15 +80,15 @@ class SpectrumDataModel: public Wt::WAbstractItemModel
 
   //setDataHistogram(): also sets m_secondSF and m_backgroundSF to
   //  m_dataLiveTime/m_{Second|Background}LiveTime
-  virtual void setDataHistogram( std::shared_ptr<SpecUtils::Measurement> hist );
+  void setDataHistogram( std::shared_ptr<SpecUtils::Measurement> hist );
 
   //setSecondDataHistogram(): also sets m_secondSF to m_dataLiveTime/m_secondDataLiveTime
-  virtual void setSecondDataHistogram( std::shared_ptr<SpecUtils::Measurement> hist,
+  void setSecondDataHistogram( std::shared_ptr<SpecUtils::Measurement> hist,
                                       const bool ownAxis );
 
   //setBackgroundHistogram(): also sets m_backgroundSF to
   //  m_dataLiveTime/m_backgroundLiveTime
-  virtual void setBackgroundHistogram( std::shared_ptr<SpecUtils::Measurement> hist );
+  void setBackgroundHistogram( std::shared_ptr<SpecUtils::Measurement> hist );
 
   // Flags for whether the background are getting subtracted.
   void setBackgroundSubtract( const bool subtract = true );
@@ -98,28 +98,28 @@ class SpectrumDataModel: public Wt::WAbstractItemModel
 
   // The following functions will return an empty std::shared_ptr<SpecUtils::Measurement> if the data histogram
   // was not previously set.
-  virtual std::shared_ptr<SpecUtils::Measurement>      getData();
-  virtual std::shared_ptr<SpecUtils::Measurement>      getSecondData();
-  virtual std::shared_ptr<SpecUtils::Measurement>      getBackground();
+  std::shared_ptr<SpecUtils::Measurement>      getData();
+  std::shared_ptr<SpecUtils::Measurement>      getSecondData();
+  std::shared_ptr<SpecUtils::Measurement>      getBackground();
 
-  virtual std::shared_ptr<const SpecUtils::Measurement> getData()       const;
-  virtual std::shared_ptr<const SpecUtils::Measurement> getSecondData() const;
-  virtual std::shared_ptr<const SpecUtils::Measurement> getBackground() const;
+  std::shared_ptr<const SpecUtils::Measurement> getData()       const;
+  std::shared_ptr<const SpecUtils::Measurement> getSecondData() const;
+  std::shared_ptr<const SpecUtils::Measurement> getBackground() const;
 
-  virtual float dataRealTime() const;
-  virtual float dataLiveTime() const;
-  virtual float dataNeutronCounts() const;
+  float dataRealTime() const;
+  float dataLiveTime() const;
+  float dataNeutronCounts() const;
 
-  virtual float secondDataRealTime() const;
-  virtual float secondDataLiveTime() const;
-  virtual float secondDataNeutronCounts() const; //actual measurment, NOT scaled by secondDataScaledBy();
+  float secondDataRealTime() const;
+  float secondDataLiveTime() const;
+  float secondDataNeutronCounts() const; //actual measurment, NOT scaled by secondDataScaledBy();
 
-  virtual float backgroundRealTime() const;
-  virtual float backgroundLiveTime() const;
-  virtual float backgroundNeutronCounts() const;  //actual measurment, NOT scaled by backgroundScaledBy();
+  float backgroundRealTime() const;
+  float backgroundLiveTime() const;
+  float backgroundNeutronCounts() const;  //actual measurment, NOT scaled by backgroundScaledBy();
 
-  virtual float secondDataScaledBy() const;  //returns m_secondSF
-  virtual float backgroundScaledBy() const;  //returns m_backgroundSF
+  float secondDataScaledBy() const;  //returns m_secondSF
+  float backgroundScaledBy() const;  //returns m_backgroundSF
 
   //Scale factors set in setSecondDataScaleFactor() and
   //  setBackgroundDataScaleFactor() multiply the live time scale factor.
@@ -152,7 +152,7 @@ class SpectrumDataModel: public Wt::WAbstractItemModel
   void setSecondarySpectrumColor( const Wt::WColor &color );
 
   std::vector< Wt::Chart::WDataSeries > suggestDataSeries() const;
-  virtual bool secondDataOwnAxis() const;
+  bool secondDataOwnAxis() const;
 
   // Find which histogram is defining the x-axis by moving through priorities.
   std::shared_ptr<SpecUtils::Measurement>      histUsedForXAxis();
@@ -189,8 +189,8 @@ class SpectrumDataModel: public Wt::WAbstractItemModel
 
   void addIntegralOfHistogramToLegend( const bool doIt = true );
 
-  virtual int  rebinFactor() const;
-  virtual void setRebinFactor( const int factor );
+  int  rebinFactor() const;
+  void setRebinFactor( const int factor );
 
   // Checks for whether a given column is actually populated.
   bool columnHasData( int column ) const;

InterSpec_resources/AppHtmlMenu.css

@@ -218,11 +218,9 @@
   opacity: .4;
 }
 
+/* When the app is not the forground app, change title bar color a little to indicate this */
 .app-titlebar.inactive, .app-titlebar.inactive button {
   /* For non-dark-mode. */
   background-color: rgb(250, 250, 250) !important;
-  
-  /* For dark-mode. */
-  /* background-color: rgb(50,50,51) !important; */
 }
 

InterSpec_resources/static_text/color_theme_dialog_help.xml

@@ -38,7 +38,7 @@ This tool allows you to customize colors on the spectrum and time charts, as wel
 
 
 <div style="width: 100%">
-  <img align="left" src="InterSpec_resources/static_text/images/color_theme_dialog_reflines.png"  class="imageBorder" style="width:55%; margin-top: 10px; "/>
+  <img align="left" src="InterSpec_resources/static_text/images/color_theme_dialog_reflines.svg"  class="imageBorder" style="width:55%; margin-top: 10px; "/>
 
   <span style="float:right; width: 44%">
    <ul>

InterSpec_resources/themes/dark/dark.css

@@ -262,3 +262,8 @@ ul.HeavyNavMenu > li.item:hover  {
 .app-titlebar .window-controls-container .window-icon-bg .window-icon:hover {
   background-color: rgb(175,175,175) !important;
 }
+
+/* When the app is not the forground app, change title bar color a little to indicate this */
+.app-titlebar.inactive, .app-titlebar.inactive button {
+  background-color: rgb(50,50,51) !important;
+}

js/AppHtmlMenu.js

@@ -8,6 +8,10 @@ function(maximized){
     $('.resizer.top,.resizer.left').show();
     $('.window-max-restore').removeClass('window-unmaximize').addClass('window-maximize');
   }
+
+  let f = function(){ window.dispatchEvent(new Event('resize')); };
+  setTimeout( f, 100 );
+  setTimeout( f, 500 );
 }
 );