Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-22 07:03:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

UI: Avoid enum/float comparisons.

Browse Source
This commit is contained in:
Unknown W. Brackets 2022-11-12 10:27:19 -08:00
parent 294d028dbf
commit c20bcc1f08
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Common/UI/View.cpp
View File

@ -19,9 +19,9 @@
namespace UI {
const float ITEM_HEIGHT = 64.f;
const float MIN_TEXT_SCALE = 0.8f;
const float MAX_ITEM_SIZE = 65535.0f;
static constexpr Size ITEM_HEIGHT = 64.f;
static constexpr float MIN_TEXT_SCALE = 0.8f;
static constexpr float MAX_ITEM_SIZE = 65535.0f;
void MeasureBySpec(Size sz, float contentWidth, MeasureSpec spec, float *measured) {
*measured = sz;

10
Common/UI/View.h
View File

@ -128,10 +128,10 @@ enum FocusDirection {
FOCUS_NEXT_PAGE,
};
enum {
WRAP_CONTENT = -1,
FILL_PARENT = -2,
};
typedef float Size; // can also be WRAP_CONTENT or FILL_PARENT.
static constexpr Size WRAP_CONTENT = -1.0f;
static constexpr Size FILL_PARENT = -2.0f;
// Gravity
enum Gravity {
@ -174,8 +174,6 @@ enum class BorderStyle {
ITEM_DOWN_BG,
};
typedef float Size; // can also be WRAP_CONTENT or FILL_PARENT.
enum Orientation {
ORIENT_HORIZONTAL,
ORIENT_VERTICAL,

2
Common/UI/ViewGroup.cpp
View File

@ -22,7 +22,7 @@
namespace UI {
const float ITEM_HEIGHT = 64.f;
static constexpr Size ITEM_HEIGHT = 64.f;
void ApplyGravity(const Bounds outer, const Margins &margins, float w, float h, int gravity, Bounds &inner) {
inner.w = w;