- change: Use qt.conf to use freetype font engine. User can use the windows default font engine by remove this file.

This commit is contained in:
Roy Qu 2023-11-19 16:41:36 +08:00
parent 3f95655e79
commit 49237ebf03
12 changed files with 28 additions and 8 deletions

View File

@ -29,6 +29,7 @@ Red Panda C++ Version 2.26
- fix: Line numbers for problem case input/output/expected texteditors are not vertically centered. - fix: Line numbers for problem case input/output/expected texteditors are not vertically centered.
- enhancement: E-ink color scheme. - enhancement: E-ink color scheme.
- fix: Use the system default encoding for input when running problem cases. - fix: Use the system default encoding for input when running problem cases.
- change: Use qt.conf to set the font engine. User can use the windows default font engine by remove this file.
Red Panda C++ Version 2.25 Red Panda C++ Version 2.25

View File

@ -250,11 +250,11 @@ void setTheme(const QString& theme) {
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
#ifdef Q_OS_WINDOWS //#ifdef Q_OS_WINDOWS
// Make title bar and palette follow system-wide dark mode setting on recent Windows releases. // // Make title bar and palette follow system-wide dark mode setting on recent Windows releases.
// Use freetype as the fontengine // // Use freetype as the fontengine
qputenv("QT_QPA_PLATFORM", "windows:darkmode=2:fontengine=freetype"); // qputenv("QT_QPA_PLATFORM", "windows:darkmode=2:fontengine=freetype");
#endif //#endif
#ifdef Q_OS_MACOS #ifdef Q_OS_MACOS
// in macOS GUI apps, `/usr/local/bin` is not in PATH by default // in macOS GUI apps, `/usr/local/bin` is not in PATH by default

View File

@ -6239,7 +6239,7 @@ void QSynEdit::mouseReleaseEvent(QMouseEvent *event)
int X=event->pos().x(); int X=event->pos().x();
/* int Y=event->pos().y(); */ /* int Y=event->pos().y(); */
if (!mMouseMoved && (X < mGutterWidth + 2)) { if (!mMouseMoved && (X <= mGutterWidth )) {
processGutterClick(event); processGutterClick(event);
} }
@ -6295,7 +6295,7 @@ void QSynEdit::mouseDoubleClickEvent(QMouseEvent *event)
{ {
QAbstractScrollArea::mouseDoubleClickEvent(event); QAbstractScrollArea::mouseDoubleClickEvent(event);
QPoint ptMouse = event->pos(); QPoint ptMouse = event->pos();
if (ptMouse.x() >= mGutterWidth + 2) { if (ptMouse.x() >= mGutterWidth) {
if (mOptions.testFlag(EditorOption::eoSelectWordByDblClick)) if (mOptions.testFlag(EditorOption::eoSelectWordByDblClick))
setSelWord(); setSelWord();
mStateFlags.setFlag(StateFlag::sfDblClicked); mStateFlags.setFlag(StateFlag::sfDblClicked);

View File

@ -57,6 +57,8 @@ pushd .
cd "${PACKAGE_DIR}" cd "${PACKAGE_DIR}"
ln -s "${MINGW}" $MinGW_NAME ln -s "${MINGW}" $MinGW_NAME
cp "${SOURCE_DIR}/platform/windows/qt.conf" .
cp "${SOURCE_DIR}/windows/installer-scripts/lang.nsh" . cp "${SOURCE_DIR}/windows/installer-scripts/lang.nsh" .
cp "${SOURCE_DIR}/windows/installer-scripts/redpanda-clang.nsi" . cp "${SOURCE_DIR}/windows/installer-scripts/redpanda-clang.nsi" .

View File

@ -29,6 +29,8 @@ echo "Making no-compiler installer ..."
pushd . pushd .
cd "${PACKAGE_DIR}" cd "${PACKAGE_DIR}"
cp "${SOURCE_DIR}/platform/windows/qt.conf" .
cp "${SOURCE_DIR}/platform/windows/installer-scripts/lang.nsh" . cp "${SOURCE_DIR}/platform/windows/installer-scripts/lang.nsh" .
cp "${SOURCE_DIR}/platform/windows/installer-scripts/redpanda-i686-nocompiler.nsi" . cp "${SOURCE_DIR}/platform/windows/installer-scripts/redpanda-i686-nocompiler.nsi" .

View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
TARGET_DIR="/r/" TARGET_DIR="/z/"
BUILD_DIR="${TEMP}/redpandacpp-build" BUILD_DIR="${TEMP}/redpandacpp-build"
PACKAGE_DIR="${TEMP}/RedPanda-CPP" PACKAGE_DIR="${TEMP}/RedPanda-CPP"
GCC_DIR="/mingw64" GCC_DIR="/mingw64"
@ -29,6 +29,8 @@ echo "Making no-compiler installer ..."
pushd . pushd .
cd "${PACKAGE_DIR}" cd "${PACKAGE_DIR}"
cp "${SOURCE_DIR}/platform/windows/qt.conf" .
cp "${SOURCE_DIR}/platform/windows/installer-scripts/lang.nsh" . cp "${SOURCE_DIR}/platform/windows/installer-scripts/lang.nsh" .
cp "${SOURCE_DIR}/platform/windows/installer-scripts/redpanda-nocompiler.nsi" . cp "${SOURCE_DIR}/platform/windows/installer-scripts/redpanda-nocompiler.nsi" .

View File

@ -33,6 +33,8 @@ echo "Making no-compiler installer ..."
pushd . pushd .
cd "${PACKAGE_DIR}" cd "${PACKAGE_DIR}"
cp "${SOURCE_DIR}/platform/windows/qt.conf" .
cp "${SOURCE_DIR}/platform/windows/installer-scripts/lang.nsh" . cp "${SOURCE_DIR}/platform/windows/installer-scripts/lang.nsh" .
cp "${SOURCE_DIR}/platform/windows/installer-scripts/redpanda-i686-nocompiler.nsi" . cp "${SOURCE_DIR}/platform/windows/installer-scripts/redpanda-i686-nocompiler.nsi" .

View File

@ -93,6 +93,7 @@ Section "$(SectionMainName)" SectionMain
File "LICENSE" File "LICENSE"
File "NEWS.md" File "NEWS.md"
File "README.md" File "README.md"
File "qt.conf"
; Write required paths ; Write required paths
SetOutPath $INSTDIR\Templates SetOutPath $INSTDIR\Templates
@ -464,6 +465,7 @@ Section "Uninstall"
Delete "$INSTDIR\astyle.exe" Delete "$INSTDIR\astyle.exe"
Delete "$INSTDIR\LICENSE" Delete "$INSTDIR\LICENSE"
Delete "$INSTDIR\README.md" Delete "$INSTDIR\README.md"
Delete "$INSTDIR\qt.conf"
RMDir /r "$INSTDIR\Lang" RMDir /r "$INSTDIR\Lang"
RMDir /r "$INSTDIR\Templates" RMDir /r "$INSTDIR\Templates"

View File

@ -93,6 +93,7 @@ Section "$(SectionMainName)" SectionMain
File "LICENSE" File "LICENSE"
File "NEWS.md" File "NEWS.md"
File "README.md" File "README.md"
File "qt.conf"
; Write required paths ; Write required paths
SetOutPath $INSTDIR\Templates SetOutPath $INSTDIR\Templates
@ -456,6 +457,7 @@ Section "Uninstall"
Delete "$INSTDIR\astyle.exe" Delete "$INSTDIR\astyle.exe"
Delete "$INSTDIR\LICENSE" Delete "$INSTDIR\LICENSE"
Delete "$INSTDIR\README.md" Delete "$INSTDIR\README.md"
Delete "$INSTDIR\qt.conf"
RMDir /r "$INSTDIR\Lang" RMDir /r "$INSTDIR\Lang"
RMDir /r "$INSTDIR\Templates" RMDir /r "$INSTDIR\Templates"

View File

@ -93,6 +93,7 @@ Section "$(SectionMainName)" SectionMain
File "LICENSE" File "LICENSE"
File "NEWS.md" File "NEWS.md"
File "README.md" File "README.md"
File "qt.conf"
; Write required paths ; Write required paths
SetOutPath $INSTDIR\Templates SetOutPath $INSTDIR\Templates
@ -462,6 +463,8 @@ Section "Uninstall"
Delete "$INSTDIR\astyle.exe" Delete "$INSTDIR\astyle.exe"
Delete "$INSTDIR\LICENSE" Delete "$INSTDIR\LICENSE"
Delete "$INSTDIR\README.md" Delete "$INSTDIR\README.md"
Delete "$INSTDIR\qt.conf"
RMDir /r "$INSTDIR\Lang" RMDir /r "$INSTDIR\Lang"
RMDir /r "$INSTDIR\Templates" RMDir /r "$INSTDIR\Templates"

View File

@ -92,6 +92,7 @@ Section "$(SectionMainName)" SectionMain
File "LICENSE" File "LICENSE"
File "NEWS.md" File "NEWS.md"
File "README.md" File "README.md"
File "qt.conf"
; Write required paths ; Write required paths
SetOutPath $INSTDIR\Templates SetOutPath $INSTDIR\Templates
@ -455,6 +456,7 @@ Section "Uninstall"
Delete "$INSTDIR\astyle.exe" Delete "$INSTDIR\astyle.exe"
Delete "$INSTDIR\LICENSE" Delete "$INSTDIR\LICENSE"
Delete "$INSTDIR\README.md" Delete "$INSTDIR\README.md"
Delete "$INSTDIR\qt.conf"
RMDir /r "$INSTDIR\Lang" RMDir /r "$INSTDIR\Lang"
RMDir /r "$INSTDIR\Templates" RMDir /r "$INSTDIR\Templates"

View File

@ -94,6 +94,7 @@ Section "$(SectionMainName)" SectionMain
File "LICENSE" File "LICENSE"
File "NEWS.md" File "NEWS.md"
File "README.md" File "README.md"
File "qt.conf"
; Write required paths ; Write required paths
SetOutPath $INSTDIR\Templates SetOutPath $INSTDIR\Templates
@ -465,6 +466,7 @@ Section "Uninstall"
Delete "$INSTDIR\astyle.exe" Delete "$INSTDIR\astyle.exe"
Delete "$INSTDIR\LICENSE" Delete "$INSTDIR\LICENSE"
Delete "$INSTDIR\README.md" Delete "$INSTDIR\README.md"
Delete "$INSTDIR\qt.conf"
RMDir /r "$INSTDIR\Lang" RMDir /r "$INSTDIR\Lang"
RMDir /r "$INSTDIR\Templates" RMDir /r "$INSTDIR\Templates"