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

Adds wordwrap and text selectability for messages and replies #1050

Closed
wants to merge 17 commits into from
Closed

Adds wordwrap and text selectability for messages and replies #1050

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
1f918e1
Fixes #815 adds wordwrap for SecureQLabel
kushaldas Apr 7, 2020
6aff05f
Half done work on the UI to use QPlainTextEdit
kushaldas Apr 9, 2020
8b6d1bb
create textedit speech bubbles
Apr 9, 2020
5392c46
adjust textedit height
Apr 13, 2020
e28cca5
simplify resize logic for textedit
Apr 13, 2020
c1bb6f7
center message text
Apr 13, 2020
974189d
update tests for updating speech bubble text
Apr 13, 2020
d9702a3
update functional tests to get text using toPlainText
Apr 13, 2020
e2a4e26
app: QPlainTextEdit single selection to prevent user confusion
redshiftzero Apr 16, 2020
f837b3a
disable SecureQPlainTextEdit context menu
redshiftzero Apr 16, 2020
c91433c
use pixels instead of chars to resize
Apr 20, 2020
52248e7
app: use document margin pixel width in computing max line width
redshiftzero Apr 21, 2020
f4202b3
app: reduce padding now that scroll bar does not appear
redshiftzero Apr 21, 2020
1b56034
test: add coverage for SecureQPlainTextEdit
redshiftzero Apr 21, 2020
3f8db24
type annotations: event handlers on SecureQPlainTextEdit
redshiftzero Apr 21, 2020
f93944a
Revert "app: reduce padding now that scroll bar does not appear"
redshiftzero Apr 21, 2020
5bf3f0a
Working word wrapping, needs more work
kushaldas Apr 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
type annotations: event handlers on SecureQPlainTextEdit
  • Loading branch information
@redshiftzero
redshiftzero committed Apr 21, 2020
commit 3f8db24e74208c852c1f14e5462699f1c4ee2dc2
6 changes: 3 additions & 3 deletions securedrop_client/gui/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

from PyQt5.QtWidgets import QLabel, QHBoxLayout, QPlainTextEdit, QPushButton, QWidget
from PyQt5.QtCore import QSize, Qt
from PyQt5.QtGui import QFont
from PyQt5.QtGui import QFocusEvent, QFont, QMouseEvent

from securedrop_client.resources import load_svg, load_icon

Expand Down Expand Up @@ -244,11 +244,11 @@ def setPlainText(self, text: str) -> None:
self.height = self.HEIGHT_BASE + (document_lines * self.LINE_HEIGHT)
self.setFixedHeight(self.height)

def mouseReleaseEvent(self, event):
def mouseReleaseEvent(self, event: QMouseEvent) -> None:
self.setFocus()
super().mouseReleaseEvent(event)

def focusOutEvent(self, event):
def focusOutEvent(self, event: QFocusEvent) -> None:
clear_text_cursor = self.textCursor()
clear_text_cursor.clearSelection()
self.setTextCursor(clear_text_cursor)
Expand Down