fix: scroller not correctly updated with font size

change: reduce pen size of wave underline

RedPandaIDE/RedPandaIDE.pro

@@ -611,11 +611,11 @@ iconsets_files.files += $$files(resources/iconsets/*.json, true)
 ENABLE_LUA_ADDON {
     theme_files.files += $$files(themes/*.lua, false)
 } else {
-    theme_files.files += $$files(themes/*.json, false)
+    theme_files.files += $$files(resources/themes/*.json, false)
 }
-theme_files.files += $$files(themes/*.png, false)
+theme_files.files += $$files(resources/themes/*.png, false)
 
-colorscheme_files.files += $$files(colorschemes/*.scheme, false)
+colorscheme_files.files += $$files(resources/colorschemes/*.scheme, false)
 
 RESOURCES += qmake_qm_files
 RESOURCES += iconsets_files

RedPandaIDE/editor.cpp

@@ -1886,8 +1886,9 @@ void Editor::onStatusChanged(QSynedit::StatusChanges changes)
                         || (attri->tokenType() == QSynedit::TokenType::Keyword)
                         || (attri->tokenType() == QSynedit::TokenType::Preprocessor)
                         || (attri->tokenType() == QSynedit::TokenType::String)
-                        || (attri->tokenType() == QSynedit::TokenType::Comment)
-                    )) {
+                        || (attri->tokenType() == QSynedit::TokenType::Comment))
+                    && !token.isEmpty()
+                    && isIdentStartChar(token[0])) {
                 mCurrentHighlightedWord = token;
             } else {
                 mCurrentHighlightedWord = "";

RedPandaIDE/project.cpp

@@ -1481,6 +1481,8 @@ void Project::buildPrivateResource()
         case ProjectType::DynamicLib:
             contents.append("FILETYPE VFT_DLL");
             break;
+        default:
+            break;
         }
         contents.append("{");
         contents.append("  BLOCK \"StringFileInfo\"");

RedPandaIDE/settings.cpp

@@ -251,11 +251,11 @@ QString Settings::Dirs::data(Settings::Dirs::DataType dataType) const
     case DataType::None:
         return dataDir;
     case DataType::ColorScheme:
-        return ":/colorschemes";
+        return ":/resources/colorschemes";
     case DataType::IconSet:
         return ":/resources/iconsets";
     case DataType::Theme:
-        return ":/themes";
+        return ":/resources/themes";
     case DataType::Template:
         return includeTrailingPathDelimiter(appResourceDir()) + "templates";
     }

RedPandaIDE/thememanager.h

@@ -75,7 +75,9 @@ public:
 
     enum class ThemeType {
         JSON,
+#ifdef ENABLE_LUA_ADDON
         Lua,
+#endif
     };
 
     AppTheme(const QString& filename, ThemeType type, QObject* parent=nullptr);