Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #965 from AMDmi3/master

Fix some labels not displayed
  • Loading branch information...
commit 48142fbc6f0d96cf2084e82cad4fb46a8b7f880f 2 parents bd8e43a + 3e46b9c
@clintbellanger authored
Showing with 7 additions and 2 deletions.
  1. +3 −0  src/WidgetLabel.cpp
  2. +4 −2 src/WidgetLabel.h
View
3  src/WidgetLabel.cpp
@@ -28,6 +28,9 @@ FLARE. If not, see http://www.gnu.org/licenses/
using namespace std;
+LabelInfo::LabelInfo() : x(0), y(0), justify(JUSTIFY_LEFT), valign(VALIGN_TOP), hidden(false) {
+}
+
/**
* This is used in menus (e.g. MenuInventory) when parsing their config files
*/
View
6 src/WidgetLabel.h
@@ -33,11 +33,13 @@ const int VALIGN_CENTER = 0;
const int VALIGN_TOP = 1;
const int VALIGN_BOTTOM = 2;
-typedef struct LabelInfo {
+struct LabelInfo {
int x,y;
int justify,valign;
bool hidden;
-}LabelInfo;
+
+ LabelInfo();
+};
LabelInfo eatLabelInfo(std::string val);
Please sign in to comment.
Something went wrong with that request. Please try again.