Skip to content
Permalink
Browse files

Change typedef to normal definitions in GUI code

  • Loading branch information
sfan5 committed Nov 26, 2020
1 parent 868749b commit 9bb381ebd387cd783da8d582949bf284a29d9b3a
Showing with 14 additions and 14 deletions.
  1. +5 −5 src/gui/guiEngine.h
  2. +9 −9 src/gui/guiFormSpecMenu.h
@@ -29,22 +29,22 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "util/enriched_string.h"

/******************************************************************************/
/* Typedefs and macros */
/* Structs and macros */
/******************************************************************************/
/** texture layer ids */
typedef enum {
enum texture_layer {
TEX_LAYER_BACKGROUND = 0,
TEX_LAYER_OVERLAY,
TEX_LAYER_HEADER,
TEX_LAYER_FOOTER,
TEX_LAYER_MAX
} texture_layer;
};

typedef struct {
struct image_definition {
video::ITexture *texture = nullptr;
bool tile;
unsigned int minsize;
} image_definition;
};

/******************************************************************************/
/* forward declarations */
@@ -41,7 +41,7 @@ class Client;
class GUIScrollContainer;
class ISoundManager;

typedef enum {
enum FormspecFieldType {
f_Button,
f_Table,
f_TabHeader,
@@ -53,13 +53,13 @@ typedef enum {
f_HyperText,
f_AnimatedImage,
f_Unknown
} FormspecFieldType;
};

typedef enum {
enum FormspecQuitMode {
quit_mode_no,
quit_mode_accept,
quit_mode_cancel
} FormspecQuitMode;
};

struct TextDest
{
@@ -356,7 +356,7 @@ class GUIFormSpecMenu : public GUIModalMenu
JoystickController *m_joystick;
bool m_show_debug = false;

typedef struct {
struct parserData {
bool explicit_size;
bool real_coordinates;
u8 simple_field_count;
@@ -384,16 +384,16 @@ class GUIFormSpecMenu : public GUIModalMenu

// used to restore table selection/scroll/treeview state
std::unordered_map<std::string, GUITable::DynamicData> table_dyndata;
} parserData;
};

typedef struct {
struct fs_key_pending {
bool key_up;
bool key_down;
bool key_enter;
bool key_escape;
} fs_key_pendig;
};

fs_key_pendig current_keys_pending;
fs_key_pending current_keys_pending;
std::string current_field_enter_pending = "";
std::vector<std::string> m_hovered_item_tooltips;

0 comments on commit 9bb381e

Please sign in to comment.