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

Fix Windows UI and font squishing #16034

Merged
merged 2 commits into from Mar 21, 2017
Merged

Conversation

@jonathandturner
Copy link

jonathandturner commented Mar 20, 2017

This PR:

  • updates the browserhtml dep (fixes #15255)
  • updates the Windows font metric calculation (fixes #15698, based on codec-abc #15937 (comment))
  • may address #15933. With this PR, I was not able to repro

  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #__ (github issue number if applicable).
  • There are tests for these changes OR
  • These changes do not require tests because change are to UI/visual results of font drawing

This change is Reviewable

Jonathan Turner added 2 commits Mar 19, 2017
@highfive
Copy link

highfive commented Mar 20, 2017

Thanks for the pull request, and welcome! The Servo team is excited to review your changes, and you should hear from @KiChjang (or someone else) soon.

@highfive
Copy link

highfive commented Mar 20, 2017

warning Warning warning

  • These commits modify gfx code, but no tests are modified. Please consider adding a test!
@samlh
Copy link
Contributor

samlh commented Mar 20, 2017

These changes do not require tests because change are to UI/visual results of font drawing

Hrm, isn't that something a reftest could cover?

Perhaps more problematic - are tests being run on Windows in CI?

@jdm
Copy link
Member

jdm commented Mar 20, 2017

We do not run any tests on our windows builders yet.

@jonathandturner
Copy link
Author

jonathandturner commented Mar 20, 2017

Yeah, I definitely think we could flesh out the testing a bit, but I'm of the mind of "let's get Windows stood up and in the nightlies... then when we have more eyes on it, we'll have people help us keep pushing quality forward"

Seeing the higher order bit being just getting Windows out there.

@nox
Copy link
Member

nox commented Mar 21, 2017

@jonathandturner I removed the mention of @codec-abc in the PR description because such mentions then trigger an email notification every time the merge commit is pushed to new GH repositories, please don't mention in there and only in comments instead.

@KiChjang
Copy link
Member

KiChjang commented Mar 21, 2017

r? @metajack or someone who knows windows stuff

@highfive highfive assigned metajack and unassigned KiChjang Mar 21, 2017
@metajack
Copy link
Contributor

metajack commented Mar 21, 2017

@bors-servo r+

I was sad there was no documentation on struct FontMetrics in gfx/font.rs. Could you file this?

@bors-servo
Copy link
Contributor

bors-servo commented Mar 21, 2017

📌 Commit f38bab4 has been approved by metajack

@bors-servo
Copy link
Contributor

bors-servo commented Mar 21, 2017

Testing commit f38bab4 with merge cea1760...

bors-servo added a commit that referenced this pull request Mar 21, 2017
Fix Windows UI and font squishing

<!-- Please describe your changes on the following line: -->

This PR:

* updates the browserhtml dep (fixes #15255)
* updates the Windows font metric calculation (fixes #15698, based on codec-abc #15937 (comment))
* may address #15933.  With this PR, I was not able to repro

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because change are to UI/visual results of font drawing

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16034)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Mar 21, 2017

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css, mac-rel-wpt1, mac-rel-wpt2, windows-msvc-dev
Approved by: metajack
Pushing cea1760 to master...

@bors-servo bors-servo merged commit f38bab4 into servo:master Mar 21, 2017
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@metajack
Copy link
Contributor

metajack commented Mar 21, 2017

@jonathandturner Thanks for knocking these out!

@hinaria hinaria mentioned this pull request Jun 15, 2017
2 of 2 tasks complete
bors-servo added a commit that referenced this pull request Jun 15, 2017
windows: fix line height handling

hi there!

on windows, this change properly scales a font's line height by its size. before, this was not being done at all, which resulted in super ugly text at larger em sizes.

![demonstration](https://user-images.githubusercontent.com/975570/27185401-8e27023a-5228-11e7-8475-9e4223730d25.png)

i'm not sure what to do about tests: i wasn't able to find any similar tests, and the previous change (#16034) did not include any tests either.

i believe this also solves #16476.

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17340)
<!-- Reviewable:end -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

8 participants
You can’t perform that action at this time.