aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorvaxerski <[email protected]>2023-03-20 22:26:49 +0000
committervaxerski <[email protected]>2023-03-20 22:26:54 +0000
commitcb229f64360502c6774e7242fa353254dcacc931 (patch)
tree087f65a916dd7e70abd375a53b4152ca1ac2f28a
parente80e93fcda660c4d367a34aaad402ff0a325648f (diff)
downloadHyprland-cb229f64360502c6774e7242fa353254dcacc931.tar.gz
Hyprland-cb229f64360502c6774e7242fa353254dcacc931.zip
compositor: adjust xdp error cases
-rw-r--r--src/Compositor.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index 5650a657..94b8eb40 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -2294,11 +2294,16 @@ int CCompositor::getNewSpecialID() {
}
void CCompositor::performUserChecks() {
- static constexpr auto BAD_PORTALS = {"kde", "gnome", "wlr"};
+ static constexpr auto BAD_PORTALS = {"kde", "gnome"};
if (std::ranges::any_of(BAD_PORTALS, [&](const std::string& portal) { return std::filesystem::exists("/usr/share/xdg-desktop-portal/portals/" + portal + ".portal"); })) {
// bad portal detected
g_pHyprNotificationOverlay->addNotification("You have one or more incompatible xdg-desktop-portal impls installed. Please remove incompatible ones to avoid issues.",
CColor(0), 15000, ICON_ERROR);
}
+
+ if (std::filesystem::exists("/usr/share/xdg-desktop-portal/portals/hyprland.portal") && std::filesystem::exists("/usr/share/xdg-desktop-portal/portals/wlr.portal")) {
+ g_pHyprNotificationOverlay->addNotification("You have xdg-desktop-portal-hyprland and -wlr installed simultaneously. Please uninstall one to avoid issues.", CColor(0),
+ 15000, ICON_ERROR);
+ }
}