Skip to content

Commit

Permalink
Window controls must me used in compositor
Browse files Browse the repository at this point in the history
  • Loading branch information
neochapay committed Sep 21, 2023
1 parent 628f0db commit 383f513
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 95 deletions.
3 changes: 0 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,6 @@ else()
endif()

add_subdirectory(src)
if(MLITE_FOUND)
add_subdirectory(tools)
endif()

if(BUILD_EXAMPLES)
add_subdirectory(examples)
Expand Down
19 changes: 1 addition & 18 deletions src/glacierapp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -111,17 +111,6 @@ QQuickWindow* GlacierApp::showWindow()
qCritical() << "Top object is not Window!";
return nullptr;
}
// Add GLACIER_FORCE_WINDOW_MODE=1 into /var/lib/compositor/*.conf to run all app in window mode
bool forceWindowMode = false;
if (qgetenv("GLACIER_FORCE_WINDOW_MODE") == "1") {
forceWindowMode = true;
}
#ifdef HAS_MLITE5
// Check desktop mode in mlite config
if (MGConfItem(QStringLiteral("/nemo/apps/libglacier/desktopmode")).value(0).toBool() == true) {
forceWindowMode = true;
}
#endif

/*Load last params of window*/
#ifdef HAS_MLITE5
Expand All @@ -141,13 +130,7 @@ QQuickWindow* GlacierApp::showWindow()
if (QCoreApplication::arguments().contains("--prestart") || QCoreApplication::arguments().contains("-p")) {
qDebug() << "Application run in shadow mode";
} else {
if (QCoreApplication::arguments().contains("--window")
|| QCoreApplication::arguments().contains("-w")
|| forceWindowMode) {
window->show();
} else {
window->showFullScreen();
}
window->show();
}
return window;
}
Expand Down
16 changes: 0 additions & 16 deletions tools/CMakeLists.txt

This file was deleted.

58 changes: 0 additions & 58 deletions tools/libglacierconfig.cpp

This file was deleted.

0 comments on commit 383f513

Please sign in to comment.