Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-client-qt
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-qt
Commits
b4b1cda9
Commit
b4b1cda9
authored
Nov 8, 2023
by
Sébastien Blin
Browse files
Options
Downloads
Patches
Plain Diff
screensharing: remove unsupported options for wayland
jami-daemon#13
Change-Id: I177104e8b2faabd356293fb704372918d7e5969a
parent
e46a1236
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/app/mainview/components/CallActionBar.qml
+2
-2
2 additions, 2 deletions
src/app/mainview/components/CallActionBar.qml
src/app/utilsadapter.cpp
+6
-0
6 additions, 0 deletions
src/app/utilsadapter.cpp
src/app/utilsadapter.h
+1
-0
1 addition, 0 deletions
src/app/utilsadapter.h
with
9 additions
and
2 deletions
src/app/mainview/components/CallActionBar.qml
+
2
−
2
View file @
b4b1cda9
...
...
@@ -123,13 +123,13 @@ Control {
"
Name
"
:
JamiStrings
.
shareScreen
,
"
IconSource
"
:
JamiResources
.
laptop_black_24dp_svg
});
if
(
Qt
.
platform
.
os
.
toString
()
!==
"
osx
"
)
{
if
(
Qt
.
platform
.
os
.
toString
()
!==
"
osx
"
&&
!
UtilsAdapter
.
isWayland
()
)
{
shareModel
.
append
({
"
Name
"
:
JamiStrings
.
shareWindow
,
"
IconSource
"
:
JamiResources
.
window_black_24dp_svg
});
}
if
(
Qt
.
platform
.
os
.
toString
()
!==
"
windows
"
)
{
if
(
Qt
.
platform
.
os
.
toString
()
!==
"
windows
"
&&
!
UtilsAdapter
.
isWayland
()
)
{
// temporarily disable for windows
shareModel
.
append
({
"
Name
"
:
JamiStrings
.
shareScreenArea
,
...
...
This diff is collapsed.
Click to expand it.
src/app/utilsadapter.cpp
+
6
−
0
View file @
b4b1cda9
...
...
@@ -894,3 +894,9 @@ UtilsAdapter::createDummyImage() const
}
}
#endif
bool
UtilsAdapter
::
isWayland
()
const
{
return
!
qEnvironmentVariableIsEmpty
(
"WAYLAND_DISPLAY"
);
}
This diff is collapsed.
Click to expand it.
src/app/utilsadapter.h
+
1
−
0
View file @
b4b1cda9
...
...
@@ -162,6 +162,7 @@ public:
#ifdef ENABLE_TESTS
Q_INVOKABLE
QString
createDummyImage
()
const
;
#endif
Q_INVOKABLE
bool
isWayland
()
const
;
Q_SIGNALS
:
void
debugMessageReceived
(
const
QString
&
message
);
void
changeFontSize
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment