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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-qt
Commits
eaababc8
Commit
eaababc8
authored
1 year ago
by
Aline Gondim Santos
Browse files
Options
Downloads
Patches
Plain Diff
callactionbar: fix submenus layouts
Change-Id: I1d100b48db6ad95bf5e09642e9c12aad8ccf110a
parent
aa96b723
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/app/mainview/components/CallButtonDelegate.qml
+57
-48
57 additions, 48 deletions
src/app/mainview/components/CallButtonDelegate.qml
with
57 additions
and
48 deletions
src/app/mainview/components/CallButtonDelegate.qml
+
57
−
48
View file @
eaababc8
...
...
@@ -203,60 +203,69 @@ ItemDelegate {
anchors.fill
:
parent
color
:
menuItem
.
down
?
"
#c4aaaaaa
"
:
menuItem
.
hovered
?
"
#c4777777
"
:
"
transparent
"
}
contentItem
:
ColumnLayout
{
// After update to qt 6.4.3 the layout was broken, adding a Rectangle
// as top level in the contentIntem is a workaround which removal can be
// tested with newer qt versions
contentItem
:
Rectangle
{
anchors.fill
:
parent
spacing
:
0
RowLayout
{
Layout.fillWidth
:
true
Layout.rightMargin
:
15
Layout.leftMargin
:
20
Layout.fillHeight
:
true
Layout.alignment
:
{
if
(
menuAction
.
popupMode
!==
CallActionBar
.
ActionPopupMode
.
LayoutOption
||
TopMargin
&&
BottomMargin
)
{
return
Qt
.
AlignLeft
|
Qt
.
AlignVCenter
;
}
if
(
TopMargin
)
{
Layout
.
bottomMargin
=
4
;
return
Qt
.
AlignBottom
;
color
:
"
transparent
"
ColumnLayout
{
anchors.fill
:
parent
spacing
:
0
RowLayout
{
Layout.fillWidth
:
true
Layout.fillHeight
:
true
Layout.rightMargin
:
15
Layout.leftMargin
:
20
Layout.alignment
:
{
if
(
menuAction
.
popupMode
!==
CallActionBar
.
ActionPopupMode
.
LayoutOption
||
TopMargin
&&
BottomMargin
)
{
return
Qt
.
AlignLeft
|
Qt
.
AlignVCenter
;
}
if
(
TopMargin
)
{
Layout
.
bottomMargin
=
4
;
return
Qt
.
AlignBottom
;
}
Layout
.
topMargin
=
4
;
return
Qt
.
AlignTop
;
}
Layout
.
topMargin
=
4
;
return
Qt
.
AlignTop
;
}
spacing
:
6
ResponsiveImage
{
source
:
menuAction
.
popupMode
===
CallActionBar
.
ActionPopupMode
.
ListElement
||
menuAction
.
popupMode
===
CallActionBar
.
ActionPopupMode
.
LayoutOption
?
IconSource
:
(
menuItem
.
ListView
.
isCurrentItem
?
JamiResources
.
check_box_24dp_svg
:
JamiResources
.
check_box_outline_blank_24dp_svg
)
color
:
"
white
"
width
:
20
height
:
20
spacing
:
6
ResponsiveImage
{
source
:
menuAction
.
popupMode
===
CallActionBar
.
ActionPopupMode
.
ListElement
||
menuAction
.
popupMode
===
CallActionBar
.
ActionPopupMode
.
LayoutOption
?
IconSource
:
(
menuItem
.
ListView
.
isCurrentItem
?
JamiResources
.
check_box_24dp_svg
:
JamiResources
.
check_box_outline_blank_24dp_svg
)
color
:
"
white
"
width
:
20
height
:
20
}
Text
{
id
:
delegateText
Layout.fillWidth
:
true
horizontalAlignment
:
Text
.
AlignLeft
verticalAlignment
:
Text
.
AlignVCenter
text
:
menuAction
.
popupMode
===
CallActionBar
.
ActionPopupMode
.
ListElement
||
menuAction
.
popupMode
===
CallActionBar
.
ActionPopupMode
.
LayoutOption
?
Name
:
DeviceName
elide
:
Text
.
ElideRight
font.pointSize
:
JamiTheme
.
participantFontSize
color
:
"
white
"
}
ResponsiveImage
{
source
:
JamiResources
.
check_black_24dp_svg
color
:
"
white
"
width
:
20
height
:
20
visible
:
menuAction
.
popupMode
===
CallActionBar
.
ActionPopupMode
.
LayoutOption
?
ActiveSetting
:
false
}
}
Text
{
id
:
delegateText
Rectangle
{
id
:
buttonDiv
visible
:
menuAction
.
popupMode
===
CallActionBar
.
ActionPopupMode
.
LayoutOption
?
SectionEnd
:
false
Layout.fillWidth
:
true
horizontalAlignment
:
Text
.
AlignLeft
verticalAlignment
:
Text
.
AlignVCenter
text
:
menuAction
.
popupMode
===
CallActionBar
.
ActionPopupMode
.
ListElement
||
menuAction
.
popupMode
===
CallActionBar
.
ActionPopupMode
.
LayoutOption
?
Name
:
DeviceName
elide
:
Text
.
ElideRight
font.pointSize
:
JamiTheme
.
participantFontSize
color
:
"
white
"
height
:
1
opacity
:
0.2
border.width
:
0
color
:
JamiTheme
.
separationLine
Layout.alignment
:
Qt
.
AlignBottom
}
ResponsiveImage
{
source
:
JamiResources
.
check_black_24dp_svg
color
:
"
white
"
width
:
20
height
:
20
visible
:
menuAction
.
popupMode
===
CallActionBar
.
ActionPopupMode
.
LayoutOption
?
ActiveSetting
:
false
}
}
Rectangle
{
id
:
buttonDiv
visible
:
menuAction
.
popupMode
===
CallActionBar
.
ActionPopupMode
.
LayoutOption
?
SectionEnd
:
false
Layout.fillWidth
:
true
height
:
1
opacity
:
0.2
border.width
:
0
color
:
JamiTheme
.
separationLine
Layout.alignment
:
Qt
.
AlignBottom
}
}
}
...
...
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