fix: scroller not correctly updated with font size
change: reduce pen size of wave underline
This commit is contained in:
parent
bcf2288cde
commit
71b869b186
|
@ -611,11 +611,11 @@ iconsets_files.files += $$files(resources/iconsets/*.json, true)
|
||||||
ENABLE_LUA_ADDON {
|
ENABLE_LUA_ADDON {
|
||||||
theme_files.files += $$files(themes/*.lua, false)
|
theme_files.files += $$files(themes/*.lua, false)
|
||||||
} else {
|
} 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 += qmake_qm_files
|
||||||
RESOURCES += iconsets_files
|
RESOURCES += iconsets_files
|
||||||
|
|
|
@ -1886,8 +1886,9 @@ void Editor::onStatusChanged(QSynedit::StatusChanges changes)
|
||||||
|| (attri->tokenType() == QSynedit::TokenType::Keyword)
|
|| (attri->tokenType() == QSynedit::TokenType::Keyword)
|
||||||
|| (attri->tokenType() == QSynedit::TokenType::Preprocessor)
|
|| (attri->tokenType() == QSynedit::TokenType::Preprocessor)
|
||||||
|| (attri->tokenType() == QSynedit::TokenType::String)
|
|| (attri->tokenType() == QSynedit::TokenType::String)
|
||||||
|| (attri->tokenType() == QSynedit::TokenType::Comment)
|
|| (attri->tokenType() == QSynedit::TokenType::Comment))
|
||||||
)) {
|
&& !token.isEmpty()
|
||||||
|
&& isIdentStartChar(token[0])) {
|
||||||
mCurrentHighlightedWord = token;
|
mCurrentHighlightedWord = token;
|
||||||
} else {
|
} else {
|
||||||
mCurrentHighlightedWord = "";
|
mCurrentHighlightedWord = "";
|
||||||
|
|
|
@ -1481,6 +1481,8 @@ void Project::buildPrivateResource()
|
||||||
case ProjectType::DynamicLib:
|
case ProjectType::DynamicLib:
|
||||||
contents.append("FILETYPE VFT_DLL");
|
contents.append("FILETYPE VFT_DLL");
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
contents.append("{");
|
contents.append("{");
|
||||||
contents.append(" BLOCK \"StringFileInfo\"");
|
contents.append(" BLOCK \"StringFileInfo\"");
|
||||||
|
|
Before Width: | Height: | Size: 917 B After Width: | Height: | Size: 917 B |
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
|
@ -251,11 +251,11 @@ QString Settings::Dirs::data(Settings::Dirs::DataType dataType) const
|
||||||
case DataType::None:
|
case DataType::None:
|
||||||
return dataDir;
|
return dataDir;
|
||||||
case DataType::ColorScheme:
|
case DataType::ColorScheme:
|
||||||
return ":/colorschemes";
|
return ":/resources/colorschemes";
|
||||||
case DataType::IconSet:
|
case DataType::IconSet:
|
||||||
return ":/resources/iconsets";
|
return ":/resources/iconsets";
|
||||||
case DataType::Theme:
|
case DataType::Theme:
|
||||||
return ":/themes";
|
return ":/resources/themes";
|
||||||
case DataType::Template:
|
case DataType::Template:
|
||||||
return includeTrailingPathDelimiter(appResourceDir()) + "templates";
|
return includeTrailingPathDelimiter(appResourceDir()) + "templates";
|
||||||
}
|
}
|
||||||
|
|
|
@ -75,7 +75,9 @@ public:
|
||||||
|
|
||||||
enum class ThemeType {
|
enum class ThemeType {
|
||||||
JSON,
|
JSON,
|
||||||
|
#ifdef ENABLE_LUA_ADDON
|
||||||
Lua,
|
Lua,
|
||||||
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
AppTheme(const QString& filename, ThemeType type, QObject* parent=nullptr);
|
AppTheme(const QString& filename, ThemeType type, QObject* parent=nullptr);
|
||||||
|
|
Loading…
Reference in New Issue