Resolve UI bug (#715) and do not require restart on settings change (#717)

* GUI: resolve issue #715

initialize mWidths with zero

* GUI: restart is nolonger required

* GUI: restart is nolonger required

* GUI: restart is nolonger required

* GUI: restart is nolonger required

* GUI: restart is nolonger required

* GUI: restart is nolonger required

* GUI: allow auto-resize of settings dialog

src/gui/Src/BasicView/Disassembly.cpp

@@ -53,6 +53,7 @@ Disassembly::Disassembly(QWidget* parent) : AbstractTableView(parent)
     connect(Bridge::getBridge(), SIGNAL(updateDump()), this, SLOT(reloadData()));
     connect(Bridge::getBridge(), SIGNAL(dbgStateChanged(DBGSTATE)), this, SLOT(debugStateChangedSlot(DBGSTATE)));
     connect(this, SIGNAL(selectionChanged(dsint)), this, SLOT(selectionChangedSlot(dsint)));
+    connect(Config(), SIGNAL(tokenizerConfigUpdated()), this, SLOT(tokenizerConfigUpdatedSlot()));
 
     Initialize();
 }
@@ -117,6 +118,11 @@ void Disassembly::updateFonts()
     setFont(ConfigFont("Disassembly"));
 }
 
+void Disassembly::tokenizerConfigUpdatedSlot()
+{
+    mDisasm->UpdateConfig();
+}
+
 /************************************************************************************
                             Reimplemented Functions
 ************************************************************************************/

src/gui/Src/BasicView/Disassembly.h

@@ -105,6 +105,7 @@ public slots:
     void disassembleAt(dsint parVA, dsint parCIP);
     void debugStateChangedSlot(DBGSTATE state);
     void selectionChangedSlot(dsint parVA);
+    void tokenizerConfigUpdatedSlot();
 
 private:
     enum GuiState_t {NoState, MultiRowsSelectionState};

src/gui/Src/Gui/SettingsDialog.cpp

@@ -12,8 +12,9 @@ SettingsDialog::SettingsDialog(QWidget* parent) :
     ui->setupUi(this);
     //set window flags
     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint | Qt::MSWindowsFixedSizeDialogHint);
-    setFixedSize(this->size()); //fixed size
     setModal(true);
+    adjustSize();
+    bTokenizerConfigUpdated = false;
     LoadSettings(); //load settings from file
     connect(Bridge::getBridge(), SIGNAL(setLastException(uint)), this, SLOT(setLastException(uint)));
     lastException = 0;
@@ -303,6 +304,11 @@ void SettingsDialog::SaveSettings()
 
     BridgeSettingFlush();
     Config()->load();
+    if(bTokenizerConfigUpdated)
+    {
+        Config()->emitTokenizerConfigUpdated();
+        bTokenizerConfigUpdated = false;
+    }
     DbgSettingsUpdated();
     GuiUpdateAllViews();
 }
@@ -582,6 +588,7 @@ void SettingsDialog::on_btnAddLast_clicked()
 
 void SettingsDialog::on_chkArgumentSpaces_stateChanged(int arg1)
 {
+    bTokenizerConfigUpdated = true;
     if(arg1 == Qt::Unchecked)
         settings.disasmArgumentSpaces = false;
     else
@@ -590,6 +597,7 @@ void SettingsDialog::on_chkArgumentSpaces_stateChanged(int arg1)
 
 void SettingsDialog::on_chkMemorySpaces_stateChanged(int arg1)
 {
+    bTokenizerConfigUpdated = true;
     if(arg1 == Qt::Unchecked)
         settings.disasmMemorySpaces = false;
     else
@@ -598,6 +606,7 @@ void SettingsDialog::on_chkMemorySpaces_stateChanged(int arg1)
 
 void SettingsDialog::on_chkUppercase_stateChanged(int arg1)
 {
+    bTokenizerConfigUpdated = true;
     if(arg1 == Qt::Unchecked)
         settings.disasmUppercase = false;
     else
@@ -614,6 +623,7 @@ void SettingsDialog::on_chkOnlyCipAutoComments_stateChanged(int arg1)
 
 void SettingsDialog::on_chkTabBetweenMnemonicAndArguments_stateChanged(int arg1)
 {
+    bTokenizerConfigUpdated = true;
     settings.disasmTabBetweenMnemonicAndArguments = arg1 == Qt::Checked;
 }
 

src/gui/Src/Gui/SettingsDialog.h

@@ -141,6 +141,7 @@ private:
     QList<RangeStruct> realExceptionRanges;
     bool bJitOld;
     bool bJitAutoOld;
+    bool bTokenizerConfigUpdated;
 
     //functions
     void GetSettingBool(const char* section, const char* name, bool* set);

src/gui/Src/Utils/CachedFontMetrics.h

@@ -13,6 +13,7 @@ public:
         : QObject(parent),
           mFontMetrics(font)
     {
+        memset(mWidths, 0, sizeof(mWidths));
     }
 
     int width(const QChar & ch)

src/gui/Src/Utils/Configuration.cpp

@@ -388,6 +388,11 @@ void Configuration::emitColorsUpdated()
     emit colorsUpdated();
 }
 
+void Configuration::emitTokenizerConfigUpdated()
+{
+    emit tokenizerConfigUpdated();
+}
+
 void Configuration::readBools()
 {
     Bools = defaultBools;

src/gui/Src/Utils/Configuration.h

@@ -44,6 +44,7 @@ public:
     void readColors();
     void writeColors();
     void emitColorsUpdated();
+    void emitTokenizerConfigUpdated();
     void readBools();
     void writeBools();
     void readUints();
@@ -83,6 +84,7 @@ signals:
     void colorsUpdated();
     void fontsUpdated();
     void shortcutsUpdated();
+    void tokenizerConfigUpdated();
 
 private:
     QColor colorFromConfig(const QString id);