hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-27 15:24:05 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

fix: force wayland should work for BSD, also remove a unnecessary env check for macOS

Browse source
This commit is contained in:
shenleban tongying 2023-11-18 11:45:24 -05:00
parent 4d48ab8f40
commit 30572321f7
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main.cc
View file

@ -307,7 +307,7 @@ void processCommandLine( QCoreApplication * app, GDOptions * result )
int main( int argc, char ** argv )
{
#ifdef Q_OS_UNIX
#if defined( Q_OS_UNIX ) && !defined( Q_OS_MACOS )
// GoldenDict use lots of X11 functions and it currently cannot work
// natively on Wayland. This workaround will force GoldenDict to use
// XWayland.

2
src/ui/mainwindow.cc
View file

@ -2856,7 +2856,7 @@ void MainWindow::toggleMainWindow( bool onlyShow )
void MainWindow::installHotKeys()
{
#if defined( Q_OS_LINUX )
#if defined( Q_OS_UNIX ) && !defined( Q_OS_MACOS )
if ( !qEnvironmentVariableIsEmpty( "GOLDENDICT_FORCE_WAYLAND" ) ) {
return;
}

2
website/mkdocs.yml
View file

@ -44,7 +44,7 @@ nav:
- Custom transliteration: topic_transliteration.md
- Customize Dictionary: custom_dictionary.md
- OCR Integration: howto/ocr.md
- Wayland/Linux: topic_wayland.md
- Wayland: topic_wayland.md
- Report Bugs & Feedbacks: feedbacks.md
- Contributor Guides:
- Developer: developer.md