Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-10-26 13:00:29 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2015-10-30 15:50:52 (GMT) |
| commit | 7f321edd9ada1f531b1fbc3325ef61449218f40c (patch) | |
| tree | f0a1998447a41fa2cedff39edd1c179eefb4b298 /Swift/Controllers/HighlightAction.cpp | |
| parent | 50a3962e4d0b16fd0316be54121cfb293c3117bd (diff) | |
| download | swift-7f321edd9ada1f531b1fbc3325ef61449218f40c.zip swift-7f321edd9ada1f531b1fbc3325ef61449218f40c.tar.bz2 | |
Only highlight text if a highlight color is set
This commit has the default rule set the default color and
changes HighlightAction::highlightText_ symbol to
HighlightAction::highlightWholeMessage_ as it is more
descriptive of its use.
Test-Information:
Tested highlighting with the default rule set, and one with
a highlight color set for the chat rule.
Change-Id: Ic638e6347bdf6623ab5959341486233494f005f0
Diffstat (limited to 'Swift/Controllers/HighlightAction.cpp')
| -rw-r--r-- | Swift/Controllers/HighlightAction.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Swift/Controllers/HighlightAction.cpp b/Swift/Controllers/HighlightAction.cpp index 80d9d85..4603408 100644 --- a/Swift/Controllers/HighlightAction.cpp +++ b/Swift/Controllers/HighlightAction.cpp | |||
| @@ -12,14 +12,14 @@ | |||
| 12 | 12 | ||
| 13 | #include <Swift/Controllers/HighlightAction.h> | 13 | #include <Swift/Controllers/HighlightAction.h> |
| 14 | 14 | ||
| 15 | namespace Swift { | 15 | namespace Swift { |
| 16 | 16 | ||
| 17 | void HighlightAction::setHighlightAllText(bool highlightText) | 17 | void HighlightAction::setHighlightWholeMessage(bool highlightText) |
| 18 | { | 18 | { |
| 19 | highlightText_ = highlightText; | 19 | highlightWholeMessage_ = highlightText; |
| 20 | if (!highlightText_) { | 20 | if (!highlightWholeMessage_) { |
| 21 | textColor_.clear(); | 21 | textColor_.clear(); |
| 22 | textBackground_.clear(); | 22 | textBackground_.clear(); |
| 23 | } | 23 | } |
| 24 | } | 24 | } |
| 25 | 25 | ||
| @@ -30,11 +30,11 @@ void HighlightAction::setPlaySound(bool playSound) | |||
| 30 | soundFile_.clear(); | 30 | soundFile_.clear(); |
| 31 | } | 31 | } |
| 32 | } | 32 | } |
| 33 | 33 | ||
| 34 | bool operator ==(HighlightAction const& a, HighlightAction const& b) { | 34 | bool operator ==(HighlightAction const& a, HighlightAction const& b) { |
| 35 | if (a.highlightAllText() != b.highlightAllText()) { | 35 | if (a.highlightWholeMessage() != b.highlightWholeMessage()) { |
| 36 | return false; | 36 | return false; |
| 37 | } | 37 | } |
| 38 | 38 | ||
| 39 | if (a.getTextColor() != b.getTextColor()) { | 39 | if (a.getTextColor() != b.getTextColor()) { |
| 40 | return false; | 40 | return false; |