lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-08-29 19:23:40 +02:00
Code Activity

screensharing: remove unsupported options for wayland

Browse source 
https://git.jami.net/savoirfairelinux/jami-daemon/-/issues/13

Change-Id: I177104e8b2faabd356293fb704372918d7e5969a
This commit is contained in:
Sébastien Blin 2023-11-08 13:12:21 -05:00
parent e46a123609
commit b4b1cda9e6
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/app/mainview/components/CallActionBar.qml
View file

@ -123,13 +123,13 @@ Control {
"Name": JamiStrings.shareScreen, "Name": JamiStrings.shareScreen,
"IconSource": JamiResources.laptop_black_24dp_svg "IconSource": JamiResources.laptop_black_24dp_svg
}); });
if (Qt.platform.os.toString() !== "osx") { if (Qt.platform.os.toString() !== "osx" && !UtilsAdapter.isWayland()) {
shareModel.append({ shareModel.append({
"Name": JamiStrings.shareWindow, "Name": JamiStrings.shareWindow,
"IconSource": JamiResources.window_black_24dp_svg "IconSource": JamiResources.window_black_24dp_svg
}); });
} }
if (Qt.platform.os.toString() !== "windows") { if (Qt.platform.os.toString() !== "windows" && !UtilsAdapter.isWayland()) {
// temporarily disable for windows // temporarily disable for windows
shareModel.append({ shareModel.append({
"Name": JamiStrings.shareScreenArea, "Name": JamiStrings.shareScreenArea,

6
src/app/utilsadapter.cpp
View file

@ -894,3 +894,9 @@ UtilsAdapter::createDummyImage() const
} }
} }
#endif #endif
bool
UtilsAdapter::isWayland() const
{
return !qEnvironmentVariableIsEmpty("WAYLAND_DISPLAY");
}

1
src/app/utilsadapter.h
View file

@ -162,6 +162,7 @@ public:
#ifdef ENABLE_TESTS #ifdef ENABLE_TESTS
Q_INVOKABLE QString createDummyImage() const; Q_INVOKABLE QString createDummyImage() const;
#endif #endif
Q_INVOKABLE bool isWayland() const;
Q_SIGNALS: Q_SIGNALS:
void debugMessageReceived(const QString& message); void debugMessageReceived(const QString& message);
void changeFontSize(); void changeFontSize();