Implement softwrapping at user specified margin line #313
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Conditional went wrong...
mitya57
requested changes
Sep 9, 2017
ReText/config.py
Outdated
| @@ -83,6 +84,7 @@ def initConfigOptions(self): | |||
| (self.tr('Tab key inserts spaces'), 'tabInsertsSpaces'), | |||
| (self.tr('Tabulation width'), 'tabWidth'), | |||
| (self.tr('Draw vertical line at column'), 'rightMargin'), | |||
| (self.tr('Enable soft wrap'), 'rightMarginWrap'), | |||
ReText/config.py
Outdated
| def handleRightMarginSet(self, value): | ||
| if value > 0: | ||
| self.configurators['rightMarginWrap'].setEnabled(True) | ||
| self.configurators['rightMarginWrap'].setChecked(getattr(globalSettings, 'rightMarginWrap')) |
There was a problem hiding this comment.
Same here, just use globalSettings.rightMarginWrap.
ReText/editor.py
Outdated
| self.document().blockCountChanged.connect(self.updateLineNumberAreaWidth) | ||
| self.cursorPositionChanged.connect(self.highlightCurrentLine) | ||
| self.document().contentsChange.connect(self.contentsChange) | ||
| if globalSettings.useFakeVim: | ||
| self.installFakeVimHandler() | ||
|
|
||
| def setWrapModeAndWidth(self): | ||
| if globalSettings.rightMarginWrap and (self.rect().topRight().x() > self.marginx): | ||
| self.setLineWrapMode(2) |
There was a problem hiding this comment.
Please do not use magic numbers 1 or 2. Use QTextEdit.WidgetWidth and QTextEdit.FixedPixelWidth instead.
ReText/config.py
Outdated
| @@ -122,6 +124,8 @@ def initWidgets(self): | |||
| if isinstance(value, bool): | |||
| self.configurators[name] = QCheckBox(self) | |||
| self.configurators[name].setChecked(value) | |||
| if name == 'rightMarginWrap' and getattr(globalSettings, 'rightMargin') == 0: | |||
There was a problem hiding this comment.
You can just use globalSettings.rightMargin, no need for getattr.
|
Thank you! Merged. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As I started using ReText more often, I noticed that I missed the softwrap option of Atom.
This pull request implements a simple softwrap feature and creates the necessary preferences entry. Moreover, it can take into account whether the width of ReTextEdit(QTextEdit) is smaller than user specified margin.