projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use clicked() signal instead of toggled()
[quassel.git]
/
src
/
qtui
/
inputwidget.cpp
diff --git
a/src/qtui/inputwidget.cpp
b/src/qtui/inputwidget.cpp
index
1652393
..
a877172
100644
(file)
--- a/
src/qtui/inputwidget.cpp
+++ b/
src/qtui/inputwidget.cpp
@@
-396,6
+396,7
@@
QTextCharFormat InputWidget::getFormatOfWordOrSelection() {
void InputWidget::currentCharFormatChanged(const QTextCharFormat &format) {
fontChanged(format.font());
void InputWidget::currentCharFormatChanged(const QTextCharFormat &format) {
fontChanged(format.font());
+
if (format.foreground().isOpaque())
colorChanged(format.foreground().color());
else
if (format.foreground().isOpaque())
colorChanged(format.foreground().color());
else
@@
-406,19
+407,19
@@
void InputWidget::currentCharFormatChanged(const QTextCharFormat &format) {
colorHighlightChanged(Qt::transparent);
}
colorHighlightChanged(Qt::transparent);
}
-void InputWidget::on_boldButton_
toggl
ed(bool checked) {
+void InputWidget::on_boldButton_
click
ed(bool checked) {
QTextCharFormat fmt;
fmt.setFontWeight(checked ? QFont::Bold : QFont::Normal);
mergeFormatOnWordOrSelection(fmt);
}
QTextCharFormat fmt;
fmt.setFontWeight(checked ? QFont::Bold : QFont::Normal);
mergeFormatOnWordOrSelection(fmt);
}
-void InputWidget::on_underlineButton_
toggl
ed(bool checked) {
+void InputWidget::on_underlineButton_
click
ed(bool checked) {
QTextCharFormat fmt;
fmt.setFontUnderline(checked);
mergeFormatOnWordOrSelection(fmt);
}
QTextCharFormat fmt;
fmt.setFontUnderline(checked);
mergeFormatOnWordOrSelection(fmt);
}
-void InputWidget::on_italicButton_
toggl
ed(bool checked) {
+void InputWidget::on_italicButton_
click
ed(bool checked) {
QTextCharFormat fmt;
fmt.setFontItalic(checked);
mergeFormatOnWordOrSelection(fmt);
QTextCharFormat fmt;
fmt.setFontItalic(checked);
mergeFormatOnWordOrSelection(fmt);