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

Fixed layout measurements - added "dp" as default #20

Merged
merged 2 commits into from Feb 2, 2013
Merged

Fixed layout measurements - added "dp" as default #20

merged 2 commits into from Feb 2, 2013

Conversation

pec1985
Copy link
Contributor

@pec1985 pec1985 commented Feb 1, 2013

Test code:

var win = Ti.UI.createWindow();
var btn = Titanium.UI.createButton({
    color:'#fff',
    top: 100,
    backgroundColor:'red',
    width: '200dp',
    height: '60dp'
});
win.add(btw);
win.open();

joshthecoder
joshthecoder reviewed Feb 1, 2013
View reviewed changes
src/tibb/Layout/ParseProperty.cpp
if ((value.find("mm") != std::string::npos) || (value.find("cm") != std::string::npos) ||
(value.find("em") != std::string::npos) || (value.find("pt") != std::string::npos) ||
(value.find("in") != std::string::npos) || (value.find("px") != std::string::npos) ||
(value.find("dp") != std::string::npos) || (value.find("dip") != std::string::npos)) {
units = value.substr (value.size() - 2 , 2);
parsedValue = atof(value.substr(0, value.size() - 2).c_str());
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't think this will parse correctly if the unit is "dip". It's 3 characters not 2 so you'll just get "di".

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ha! ok, oops.

@joshthecoder
Copy link
Contributor

Reviewed code and tested. Accepted.

joshthecoder added a commit that referenced this pull request Feb 2, 2013
@joshthecoder
Merge pull request #20 from pec1985/TIMOB-12555
5af47ec 
Fixed layout measurements - added "dp" as default
@joshthecoder joshthecoder merged commit 5af47ec into appcelerator-archive:master Feb 2, 2013
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
2 participants
@pec1985 @joshthecoder