Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added missing navigation_arrow_drop_down.svg resource used in MenuField #425

Open
wants to merge 7 commits into
base: develop
Choose a base branch
from
Open

Added missing navigation_arrow_drop_down.svg resource used in MenuField #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e192199
Added missing navigation_arrow_drop_down.svg resource used in MenuField
May 2, 2016
91b5427
Added navigation_expand_more icon.
May 31, 2016
c042cda
Fixed wrong image path in CircleImage.qml
May 31, 2016
0cc6592
Added "closeOnAccept" option to dialog.
May 31, 2016
c88f5ad
Added ability to have no selection in MenuField.qml
May 31, 2016
e674cfe
Fixed Subheader component font selection issue.
May 31, 2016
74751f7
wqMerge branch 'develop' of https://github.com/papyros/qml-material i…
Sep 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions icons.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ icons:
- navigation/close
- navigation/menu
- navigation/more_vert
- navigation/expand_more
4 changes: 3 additions & 1 deletion icons/core_icons.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@

<qresource prefix="/icons/navigation">
<file alias="arrow_back.svg">navigation_arrow_back.svg</file>
<file alias="arrow_drop_down.svg">navigation_arrow_drop_down.svg</file>
<file alias="chevron_left.svg">navigation_chevron_left.svg</file>
<file alias="chevron_right.svg">navigation_chevron_right.svg</file>
<file alias="close.svg">navigation_close.svg</file>
<file alias="menu.svg">navigation_menu.svg</file>
<file alias="more_vert.svg">navigation_more_vert.svg</file>
<file alias="expand_more.svg">navigation_expand_more.svg</file>
</qresource>

</RCC>
</RCC>
1 change: 1 addition & 0 deletions icons/navigation_arrow_drop_down.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/navigation_expand_more.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 1 addition & 3 deletions src/listitems/Subheader.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,7 @@ View {
Label {
id: label

font.pixelSize: 14 * Units.dp
font.family: "Roboto"
font.weight: Font.DemiBold
style: "subheading"

anchors {
verticalCenter: parent.verticalCenter
Expand Down
4 changes: 3 additions & 1 deletion src/popups/Dialog.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ PopupBase {

default property alias dialogContent: column.data

property bool closeOnAccepted: true

signal accepted()
signal rejected()

Expand Down Expand Up @@ -312,7 +314,7 @@ PopupBase {
}

onClicked: {
close()
if(closeOnAccepted) close()
accepted();
}
}
Expand Down
8 changes: 5 additions & 3 deletions src/popups/MenuField.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,11 @@ Item {
Ink {
anchors.fill: parent
onClicked: {
listView.positionViewAtIndex(listView.currentIndex, ListView.Center)
var offset = listView.currentItem.itemLabel.mapToItem(menu, 0, 0)
menu.open(label, 0, -offset.y)
if(listView.currentIndex !== -1) {
listView.positionViewAtIndex(listView.currentIndex, ListView.Center)
var offset = listView.currentItem.itemLabel.mapToItem(menu, 0, 0)
}
menu.open(label, 0, listView.currentIndex !== -1 ? -offset.y : 0)
}
}

Expand Down