Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
bitmask-vpn
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
anna petry
bitmask-vpn
Commits
cd80a272
Commit
cd80a272
authored
3 years ago
by
Kali Kaneko
Browse files
Options
Downloads
Patches
Plain Diff
fix drawer
parent
b8d7f667
Branches
master
Branches containing commit
Tags
0.20.4
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
gui/components/MaterialButton.qml
+5
-2
5 additions, 2 deletions
gui/components/MaterialButton.qml
gui/components/NavigationDrawer.qml
+9
-2
9 additions, 2 deletions
gui/components/NavigationDrawer.qml
with
14 additions
and
4 deletions
gui/components/MaterialButton.qml
+
5
−
2
View file @
cd80a272
...
@@ -49,7 +49,7 @@ T.Button {
...
@@ -49,7 +49,7 @@ T.Button {
radius
:
4
radius
:
4
border.color
:
"
black
"
border.color
:
"
black
"
border.width
:
1
border.width
:
2
color
:
!
control
.
enabled
?
control
.
Material
.
buttonDisabledColor
:
control
.
highlighted
?
control
.
Material
.
highlightedButtonColor
:
Theme
.
buttonColor
color
:
!
control
.
enabled
?
control
.
Material
.
buttonDisabledColor
:
control
.
highlighted
?
control
.
Material
.
highlightedButtonColor
:
Theme
.
buttonColor
PaddedRectangle
{
PaddedRectangle
{
...
@@ -67,10 +67,13 @@ T.Button {
...
@@ -67,10 +67,13 @@ T.Button {
// The layer is disabled when the button color is transparent so you can do
// The layer is disabled when the button color is transparent so you can do
// Material.background: "transparent" and get a proper flat button without needing
// Material.background: "transparent" and get a proper flat button without needing
// to set Material.elevation as well
// to set Material.elevation as well
layer.enabled
:
control
.
enabled
&&
control
.
Material
.
buttonColor
.
a
>
0
layer.enabled
:
true
// control.enabled && control.Material.buttonColor.a > 0
/*
layer.effect: ElevationEffect {
layer.effect: ElevationEffect {
elevation: control.Material.elevation
elevation: control.Material.elevation
}
}
*/
Ripple
{
Ripple
{
clipRadius
:
2
clipRadius
:
2
...
...
This diff is collapsed.
Click to expand it.
gui/components/NavigationDrawer.qml
+
9
−
2
View file @
cd80a272
...
@@ -7,8 +7,14 @@ import QtQuick.Window 2.0
...
@@ -7,8 +7,14 @@ import QtQuick.Window 2.0
Rectangle
{
Rectangle
{
id
:
panel
id
:
panel
function
show
()
{
open
=
true
;
}
function
show
()
{
function
hide
()
{
open
=
false
;
}
open
=
true
;
drawerOn
=
true
;
}
function
hide
()
{
open
=
false
;
drawerOn
=
false
;
}
function
toggle
()
{
function
toggle
()
{
open
=
open
?
false
:
true
;
open
=
open
?
false
:
true
;
drawerOn
=
open
;
drawerOn
=
open
;
...
@@ -93,6 +99,7 @@ Rectangle {
...
@@ -93,6 +99,7 @@ Rectangle {
function
handleClick
(
mouse
)
{
function
handleClick
(
mouse
)
{
if
((
_rightEdge
&&
mouse
.
x
<
panel
.
x
)
||
mouse
.
x
>
panel
.
width
)
{
if
((
_rightEdge
&&
mouse
.
x
<
panel
.
x
)
||
mouse
.
x
>
panel
.
width
)
{
open
=
false
;
open
=
false
;
drawerOn
=
false
;
}
}
}
}
...
...
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