Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
L
Lichtsteuerung
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
21
Issues
21
List
Boards
Labels
Service Desk
Milestones
Iterations
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Leander Schulten
Lichtsteuerung
Commits
5f901ac5
Commit
5f901ac5
authored
Oct 29, 2019
by
Leander Schulten
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
UI: Clip TextinputField by default. Fix selection color in main.qml. Clip SettingsView if necessary
parent
1d0e4739
Pipeline
#199400
passed with stage
in 5 minutes and 38 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
37 deletions
+23
-37
src/qml/SettingsView.qml
src/qml/SettingsView.qml
+5
-13
src/qml/components/TextFieldFileChooser.qml
src/qml/components/TextFieldFileChooser.qml
+6
-14
src/qml/components/TextInputField.qml
src/qml/components/TextInputField.qml
+10
-8
src/qml/components/TextUnderline.qml
src/qml/components/TextUnderline.qml
+1
-1
src/qml/main.qml
src/qml/main.qml
+1
-1
No files found.
src/qml/SettingsView.qml
View file @
5f901ac5
...
@@ -19,6 +19,7 @@ ScrollView{
...
@@ -19,6 +19,7 @@ ScrollView{
contentHeight
:
layout
.
implicitHeight
contentHeight
:
layout
.
implicitHeight
contentWidth
:
Math
.
max
(
600
,
width
-
2
*
padding
)
contentWidth
:
Math
.
max
(
600
,
width
-
2
*
padding
)
padding
:
10
padding
:
10
clip
:
contentHeight
>
height
GridLayout
{
GridLayout
{
id
:
layout
id
:
layout
anchors.left
:
parent
.
left
anchors.left
:
parent
.
left
...
@@ -31,20 +32,11 @@ ScrollView{
...
@@ -31,20 +32,11 @@ ScrollView{
RowLayout
{
RowLayout
{
id
:
root
id
:
root
enabled
:
UserManagment
.
currentUser
.
havePermission
(
Permission
.
CHANGE_SETTINGS_FILE_PATH
)
enabled
:
UserManagment
.
currentUser
.
havePermission
(
Permission
.
CHANGE_SETTINGS_FILE_PATH
)
Item
{
TextInputField
{
Layout.fillWidth
:
true
Layout.fillWidth
:
true
Layout.preferredWidth
:
inputSettingsPath
.
implicitWidth
id
:
inputSettingsPath
Layout.preferredHeight
:
inputSettingsPath
.
implicitHeight
readOnly
:
true
Layout.topMargin
:
4
text
:
Settings
.
jsonSettingsFilePath
clip
:
true
id
:
wrapper
TextInputField
{
id
:
inputSettingsPath
readOnly
:
true
anchors.fill
:
parent
anchors.bottomMargin
:
2
text
:
Settings
.
jsonSettingsFilePath
}
}
}
Button
{
Button
{
Layout.minimumWidth
:
implicitWidth
Layout.minimumWidth
:
implicitWidth
...
...
src/qml/components/TextFieldFileChooser.qml
View file @
5f901ac5
...
@@ -10,21 +10,13 @@ RowLayout{
...
@@ -10,21 +10,13 @@ RowLayout{
property
bool
folder
:
false
property
bool
folder
:
false
property
var
fileChooser
:
null
property
var
fileChooser
:
null
height
:
20
height
:
20
Item
{
TextInputField
{
Layout.fillWidth
:
true
Layout.fillWidth
:
true
Layout.preferredWidth
:
textField
.
implicitWidth
id
:
textField
Layout.preferredHeight
:
textField
.
implicitHeight
text
:
root
.
path
Layout.topMargin
:
4
onAccepted
:
{
id
:
wrapper
root
.
path
=
text
clip
:
true
TextInputField
{
id
:
textField
text
:
root
.
path
anchors.fill
:
parent
anchors.bottomMargin
:
2
onAccepted
:
{
root
.
path
=
text
}
}
}
}
}
Button
{
Button
{
...
...
src/qml/components/TextInputField.qml
View file @
5f901ac5
...
@@ -7,23 +7,25 @@ TextInput{
...
@@ -7,23 +7,25 @@ TextInput{
color
:
Material
.
foreground
color
:
Material
.
foreground
selectByMouse
:
true
selectByMouse
:
true
font.pixelSize
:
15
font.pixelSize
:
15
selectionColor
:
Material
.
textSelectionColor
selectionColor
:
Material
.
accentColor
selectedTextColor
:
Material
.
primaryHighlightedTextColor
bottomPadding
:
3
topPadding
:
3
clip
:
contentWidth
>
width
||
underline
.
width
>
width
property
alias
underlineColor
:
underline
.
color
property
alias
underlineColor
:
underline
.
color
property
alias
underline
:
underline
property
alias
underline
:
underline
cursorDelegate
:
Rectangle
{
cursorDelegate
:
Rectangle
{
color
:
Material
.
accentColor
color
:
Material
.
accentColor
x
:
parent
.
cursorRectangle
.
x
x
:
parent
.
cursorRectangle
.
x
y
:
parent
.
cursorRectangle
.
y
y
:
parent
.
cursorRectangle
.
y
width
:
parent
.
cursorRectangle
.
width
+
1
width
:
parent
.
cursorRectangle
.
width
+
1
height
:
parent
.
cursorRectangle
.
height
height
:
parent
.
cursorRectangle
.
height
visible
:
parent
.
cursorVisible
visible
:
parent
.
cursorVisible
Behavior
on
x
{
Behavior
on
x
{
NumberAnimation
{
easing.type
:
Easing
.
OutCubic
;
easing.amplitude
:
9
;
easing.period
:
50.0
;
duration
:
500
}
NumberAnimation
{
easing.type
:
Easing
.
OutCubic
;
easing.amplitude
:
9
;
easing.period
:
50.0
;
duration
:
500
}
}
}
}
}
//onCursorRectangleChanged: underline.clickX = cursorRectangle.x
TextUnderline
{
TextUnderline
{
id
:
underline
id
:
underline
//hasFocus: parent.focus
}
}
}
}
src/qml/components/TextUnderline.qml
View file @
5f901ac5
...
@@ -5,7 +5,7 @@ Rectangle{
...
@@ -5,7 +5,7 @@ Rectangle{
id
:
underline
id
:
underline
property
real
extendetWidth
:
10
property
real
extendetWidth
:
10
//property real clickX: 0
//property real clickX: 0
anchors.
top
:
parent
.
bottom
anchors.
bottom
:
parent
.
bottom
anchors.left
:
parent
.
left
anchors.left
:
parent
.
left
width
:
parent
.
contentWidth
+
extendetWidth
width
:
parent
.
contentWidth
+
extendetWidth
height
:
2
height
:
2
...
...
src/qml/main.qml
View file @
5f901ac5
...
@@ -349,7 +349,7 @@ ApplicationWindow {
...
@@ -349,7 +349,7 @@ ApplicationWindow {
Layout.rightMargin
:
2
Layout.rightMargin
:
2
clip
:
true
clip
:
true
color
:
Material
.
foreground
color
:
Material
.
foreground
selectionColor
:
Material
.
textSelection
Color
selectionColor
:
Material
.
accent
Color
font
:
fontReference
.
font
font
:
fontReference
.
font
text
:
Settings
.
jsonSettingsFilePath
text
:
Settings
.
jsonSettingsFilePath
selectByMouse
:
true
selectByMouse
:
true
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment