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.

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

[label] Label with example page. #13

Merged
merged 1 commit into from Dec 4, 2013
Merged

[label] Label with example page. #13

merged 1 commit into from Dec 4, 2013

Conversation

locusf
Copy link
Member

@locusf locusf commented Nov 18, 2013

No description provided.

@SfietKonstantin
Copy link
Member

LGTM (quick overview)
Would love to do an in-depth review before merging.

sledges
sledges reviewed Nov 19, 2013
View reviewed changes
src/controls/Label.qml
Text {
renderType: Text.NativeRendering
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Majority of our labels are left-aligned: http://play.qwazix.com/grog/wp-content/uploads/2013/07/SystemUI.png
:)

@sledges
Copy link
Contributor

sledges commented Dec 4, 2013

LGTM, for our own components we should have less indirection with styles to reduce overhead (as per discussion between @faenil and @rburchell)
So we provide style in Label.qml and leave LabelStyle.qml empty, as you did. Accepting!

sledges added a commit that referenced this pull request Dec 4, 2013
@sledges
Merge pull request #13 from locusf/label
aed0a92 
[label] Label with example page.
@sledges sledges merged commit aed0a92 into nemomobile:master Dec 4, 2013
@faenil
Copy link
Member

faenil commented Dec 4, 2013

wait a second, why is there a LabelStyle if it's empty and not used by anyone? :D

@sledges
Copy link
Contributor

sledges commented Dec 4, 2013

Well spotted.
Sorry, I got carried away by the presence of a plethora of other *Style.qml files. https://github.com/nemomobile/qtquickcontrols-nemo/tree/master/src/styles
So if this is going because there is no equiv upstream, all others still stay?

@faenil
Copy link
Member

faenil commented Dec 4, 2013

yes, at least that's the sane thing to do imho, if nobody uses that style file :/

@sledges
Copy link
Contributor

sledges commented Dec 4, 2013

@faenil there is no LabelStyle.qml ;) I'll just clean up src/styles/styles.pro getting rid of:

LabelStyle.qml \

(everything still compiles fine btw!)
and:

# Images
#QML_FILES += \`
#    images/480x854/*.png 
#    images/480x854/theme1/*.png
#    images/480x854/theme2/*.png

Ok?

@faenil
Copy link
Member

faenil commented Dec 4, 2013

looks ok

@sledges
Copy link
Contributor

sledges commented Dec 4, 2013

pls review (everything compiles): #14

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@locusf @SfietKonstantin @sledges @faenil