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
5f272b33
Commit
5f272b33
authored
4 years ago
by
Andreas Traczyk
Browse files
Options
Downloads
Patches
Plain Diff
accountcombobox: add relief and top border
Change-Id: Ic6b31470998abd833c07a413e5b839139590b317
parent
55cbcd38
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/mainview/components/AccountComboBox.qml
+11
-0
11 additions, 0 deletions
src/mainview/components/AccountComboBox.qml
src/mainview/components/AccountComboBoxPopup.qml
+21
-8
21 additions, 8 deletions
src/mainview/components/AccountComboBoxPopup.qml
with
32 additions
and
8 deletions
src/mainview/components/AccountComboBox.qml
+
11
−
0
View file @
5f272b33
...
...
@@ -199,6 +199,17 @@ ComboBox {
implicitWidth
:
root
.
width
implicitHeight
:
root
.
height
color
:
JamiTheme
.
backgroundColor
// TODO: this can be removed when frameless window is implemented
Rectangle
{
height
:
1
anchors
{
top
:
parent
.
top
left
:
parent
.
left
right
:
parent
.
right
}
color
:
JamiTheme
.
tabbarBorderColor
}
}
MouseArea
{
...
...
This diff is collapsed.
Click to expand it.
src/mainview/components/AccountComboBoxPopup.qml
+
21
−
8
View file @
5f272b33
/*
* Copyright (C) 2020 by Savoir-faire Linux
* Author: Mingrui Zhang <mingrui.zhang@savoirfairelinux.com>
...
...
@@ -16,26 +15,27 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import
QtQuick
2.14
import
QtQuick
.
Controls
2.14
import
QtQuick
.
Layouts
1.14
import
QtGraphicalEffects
1.15
import
net
.
jami
.
Models
1.0
import
net
.
jami
.
Adapters
1.0
import
"
../../commoncomponents
"
Popup
{
id
:
comboBoxPopup
id
:
root
property
bool
toogleUpdatePopupHeight
:
false
y
:
accountComboBox
.
height
-
1
implicitWidth
:
accountComboBox
.
width
-
1
// Hack - limite the accounts that can be shown.
implicitHeight
:
{
comboBoxPopup
.
visible
root
.
visible
return
Math
.
min
(
accountComboBox
.
height
*
Math
.
min
(
5
,
accountListModel
.
rowCount
()
+
1
),
mainViewSidePanelRect
.
height
)
...
...
@@ -140,7 +140,7 @@ Popup {
onReleased
:
{
itemCoboBackground
.
color
=
JamiTheme
.
releaseColor
currentIndex
=
index
comboBoxPopup
.
close
()
root
.
close
()
AccountAdapter
.
accountChanged
(
index
)
}
onEntered
:
{
...
...
@@ -166,23 +166,36 @@ Popup {
font.pointSize
:
JamiTheme
.
textFontSize
onClicked
:
{
comboBoxPopup
.
close
()
root
.
close
()
mainViewWindow
.
startWizard
()
}
}
ScrollIndicator.vertical
:
ScrollIndicator
{}
}
background
:
Rectangle
{
id
:
accountComboBoxPopup
color
:
JamiTheme
.
backgroundColor
CustomBorder
{
commonBorder
:
false
lBorderwidth
:
1
lBorderwidth
:
2
rBorderwidth
:
1
tBorderwidth
:
1
bBorderwidth
:
1
bBorderwidth
:
2
borderColor
:
JamiTheme
.
tabbarBorderColor
}
layer
{
enabled
:
true
effect
:
DropShadow
{
color
:
"
#80000000
"
verticalOffset
:
2
horizontalOffset
:
2
samples
:
16
radius
:
10
}
}
}
}
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