Skip to content

Fix word wrap issue in SecureQLabel.#838

Merged
redshiftzero merged 1 commit intofreedomofpress:masterfrom
ntoll:text-cutoff-fix
Mar 2, 2020
Merged

Fix word wrap issue in SecureQLabel.#838
redshiftzero merged 1 commit intofreedomofpress:masterfrom
ntoll:text-cutoff-fix

Conversation

@ntoll
Copy link
Contributor

@ntoll ntoll commented Mar 2, 2020

Description

Fixes #815.

I use the built-in textwrap module with its default behaviour (which seems eminently sensible) to ensure that long words / sentences are wrapped in a way that fits properly in a SecureQLabel's text area.

See the following screenies for example output:

fixed_reply_wrap

fixed_message_wrap

Test Plan

Added unit test to ensure default word wrapping works as expected. Please check with eyeball Mk.1 👀

Checklist

If these changes modify code paths involving cryptography, the opening of files in VMs or network (via the RPC service) traffic, Qubes testing in the staging environment is required. For fine tuning of the graphical user interface, testing in any environment in Qubes is required. Please check as applicable:

  • I have tested these changes in the appropriate Qubes environment
  • I do not have an appropriate Qubes OS workstation set up (the reviewer will need to test these changes)
  • These changes should not need testing in Qubes

If these changes add or remove files other than client code, packaging logic (e.g., the AppArmor profile) may need to be updated. Please check as applicable:

  • I have submitted a separate PR to the packaging repo
  • No update to the packaging logic (e.g., AppArmor profile) is required for these changes
  • I don't know and would appreciate guidance

Copy link
Contributor

@redshiftzero redshiftzero left a comment

Choose a reason for hiding this comment

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

thanks!

@redshiftzero redshiftzero merged commit ad39c61 into freedomofpress:master Mar 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Tracking upstream issue QTBUG-85498

2 participants