From f7a7dff2a3bf1cad6e4696ac6edf58e61b0a0eb8 Mon Sep 17 00:00:00 2001
From: MUSIC <MUSIC@ANL>
Date: Fri, 26 Jul 2024 14:48:20 -0500
Subject: [PATCH] screen too small fix again

---
 DigiSettingsPanel.cpp      | 8 +++++---
 Scope.cpp                  | 7 +++++--
 SingleSpectra.cpp          | 8 ++++++--
 analyzers/EncoreAnalyzer.h | 9 +++++----
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/DigiSettingsPanel.cpp b/DigiSettingsPanel.cpp
index bd94a7e..d6f12e9 100644
--- a/DigiSettingsPanel.cpp
+++ b/DigiSettingsPanel.cpp
@@ -40,13 +40,15 @@ DigiSettingsPanel::DigiSettingsPanel(Digitizer ** digi, unsigned int nDigi, QStr
   enableSignalSlot = false;
 
   setWindowTitle("Digitizer Settings");
-  setGeometry(0, 0, 1700, 850);  
 
   //====== resize window if screen too small
   QScreen * screen = QGuiApplication::primaryScreen();
   QRect screenGeo = screen->geometry();
-  if( screenGeo.width() < 1700 || screenGeo.height() < 850) this->showMaximized(); 
-
+  if( screenGeo.width() < 1700 || screenGeo.height() < 850) {
+    setGeometry(0, 0, screenGeo.width() - 100, screenGeo.height() - 100);  
+  }else{
+    setGeometry(0, 0, 1700, 850);  
+  }
 
   tabWidget = new QTabWidget(this);
   setCentralWidget(tabWidget);
diff --git a/Scope.cpp b/Scope.cpp
index 0530d43..1d99c31 100644
--- a/Scope.cpp
+++ b/Scope.cpp
@@ -54,13 +54,16 @@ Scope::Scope(Digitizer ** digi, unsigned int nDigi, ReadDataThread ** readDataTh
   this->readDataThread = readDataThread;
 
   setWindowTitle("Scope");
-  setGeometry(0, 0, 1000, 800);  
   setWindowFlags( this->windowFlags() & ~Qt::WindowCloseButtonHint );
 
   //====== resize window if screen too small
   QScreen * screen = QGuiApplication::primaryScreen();
   QRect screenGeo = screen->geometry();
-  if( screenGeo.width() < 1000 || screenGeo.height() < 800) this->showMaximized(); 
+  if( screenGeo.width() < 1000 || screenGeo.height() < 800) {
+    setGeometry(0, 0, screenGeo.width() - 100, screenGeo.height() - 100);
+  }else{
+    setGeometry(0, 0, 1000, 800);
+  }
 
   enableSignalSlot = false;
 
diff --git a/SingleSpectra.cpp b/SingleSpectra.cpp
index 8ae9a92..a563e7a 100644
--- a/SingleSpectra.cpp
+++ b/SingleSpectra.cpp
@@ -18,13 +18,17 @@ SingleSpectra::SingleSpectra(Digitizer ** digi, unsigned int nDigi, QString rawD
   isSignalSlotActive = true;
 
   setWindowTitle("Single Histograms");
-  setGeometry(0, 0, 1000, 800);  
+  
   //setWindowFlags( this->windowFlags() & ~Qt::WindowCloseButtonHint );
 
   //====== resize window if screen too small
   QScreen * screen = QGuiApplication::primaryScreen();
   QRect screenGeo = screen->geometry();
-  if( screenGeo.width() < 1000 || screenGeo.height() < 800) this->showMaximized(); 
+  if( screenGeo.width() < 1000 || screenGeo.height() < 800) {
+    setGeometry(0, 0, screenGeo.width() - 100, screenGeo.height() - 100);
+  }else{
+    setGeometry(0, 0, 1000, 800);
+  }
 
   QWidget * layoutWidget = new QWidget(this);
   setCentralWidget(layoutWidget);
diff --git a/analyzers/EncoreAnalyzer.h b/analyzers/EncoreAnalyzer.h
index bdaed55..79a42b3 100644
--- a/analyzers/EncoreAnalyzer.h
+++ b/analyzers/EncoreAnalyzer.h
@@ -84,13 +84,14 @@ private:
 
 inline void Encore::SetUpCanvas(){
 
-  setGeometry(0, 0, 1600, 1600);  
-
   //====== resize window if screen too small
   QScreen * screen = QGuiApplication::primaryScreen();
   QRect screenGeo = screen->geometry();
-  if( screenGeo.width() < 1600 || screenGeo.height() < 1600) this->showMaximized(); 
-
+  if( screenGeo.width() < 1600 || screenGeo.height() < 1600) {
+    setGeometry(0, 0, screenGeo.width() - 100, screenGeo.height() -100);
+  }else{
+    setGeometry(0, 0, 1600, 1600);
+  }
   chkRunAnalyzer = new QCheckBox("Run Analyzer", this);
   layout->addWidget(chkRunAnalyzer, 0, 0);