diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-06-05 21:49:04 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-06-06 12:12:22 +0300 |
| commit | 2bd59adc7c456ce6f377feac8bc838e8011ebfc8 (patch) | |
| tree | f2f25428e42e59b9a6d55d7c0be9a99c42e96e40 /src/gui/popups | |
| parent | ac1ef6b19f5c1405cfaa239ab367a93b17043723 (diff) | |
| download | ManaVerse-2bd59adc7c456ce6f377feac8bc838e8011ebfc8.tar.gz ManaVerse-2bd59adc7c456ce6f377feac8bc838e8011ebfc8.tar.bz2 ManaVerse-2bd59adc7c456ce6f377feac8bc838e8011ebfc8.tar.xz ManaVerse-2bd59adc7c456ce6f377feac8bc838e8011ebfc8.zip | |
Fix code style.
Diffstat (limited to 'src/gui/popups')
| -rw-r--r-- | src/gui/popups/itempopup.cpp | 6 | ||||
| -rw-r--r-- | src/gui/popups/speechbubble.h | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/gui/popups/itempopup.cpp b/src/gui/popups/itempopup.cpp index 5ae6830cc..6121c288f 100644 --- a/src/gui/popups/itempopup.cpp +++ b/src/gui/popups/itempopup.cpp @@ -249,8 +249,10 @@ void ItemPopup::setLabelColor(Label *label, const ItemType::Type type) const { caseSetColor(ItemType::UNUSABLE, ThemeColorId::GENERIC) caseSetColor(ItemType::USABLE, ThemeColorId::USABLE) - caseSetColor(ItemType::EQUIPMENT_ONE_HAND_WEAPON, ThemeColorId::ONEHAND) - caseSetColor(ItemType::EQUIPMENT_TWO_HANDS_WEAPON, ThemeColorId::TWOHAND) + caseSetColor(ItemType::EQUIPMENT_ONE_HAND_WEAPON, + ThemeColorId::ONEHAND) + caseSetColor(ItemType::EQUIPMENT_TWO_HANDS_WEAPON, + ThemeColorId::TWOHAND) caseSetColor(ItemType::EQUIPMENT_TORSO, ThemeColorId::TORSO) caseSetColor(ItemType::EQUIPMENT_ARMS, ThemeColorId::ARMS) caseSetColor(ItemType::EQUIPMENT_HEAD, ThemeColorId::HEAD) diff --git a/src/gui/popups/speechbubble.h b/src/gui/popups/speechbubble.h index 7f09ca187..b44bb1d13 100644 --- a/src/gui/popups/speechbubble.h +++ b/src/gui/popups/speechbubble.h @@ -45,10 +45,10 @@ class SpeechBubble final : public Popup * Sets the name displayed for the speech bubble, and in what color. */ void setCaption(const std::string &name, - const Color *const color1 = - &theme->getColor(ThemeColorId::BUBBLE_NAME, 255), - const Color *const color2 = - &theme->getColor(ThemeColorId::BUBBLE_NAME_OUTLINE, 255)); + const Color *const color1 = &theme->getColor( + ThemeColorId::BUBBLE_NAME, 255), + const Color *const color2 = &theme->getColor( + ThemeColorId::BUBBLE_NAME_OUTLINE, 255)); /** * Sets the text to be displayed. |