diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2022-01-25 12:24:14 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-25 21:24:14 +0100 |
| commit | 612f26c132280da43ecfa5fa8c8cc32966f06eb6 (patch) | |
| tree | ac20d071712cf830ec526222c98d340d90721f77 /include/JSystem/J2DGraph | |
| parent | 6f4d068f1d7c5a9f25f1920e64e5b10dc29aea07 (diff) | |
d_kankyo_wether / d_eye_hl (#178)
* d_eye_hl / d_kankyo_wether wip
* more d_kankyo_wether + format
* remove asm
* some d_kankyo wip
* fix dccs vtable
* some m_Do_graphic / d_meter2_draw work
Diffstat (limited to 'include/JSystem/J2DGraph')
| -rw-r--r-- | include/JSystem/J2DGraph/J2DPane.h | 1 | ||||
| -rw-r--r-- | include/JSystem/J2DGraph/J2DPicture.h | 4 | ||||
| -rw-r--r-- | include/JSystem/J2DGraph/J2DTextBox.h | 21 |
3 files changed, 24 insertions, 2 deletions
diff --git a/include/JSystem/J2DGraph/J2DPane.h b/include/JSystem/J2DGraph/J2DPane.h index 73a920ee42..59b6a63e05 100644 --- a/include/JSystem/J2DGraph/J2DPane.h +++ b/include/JSystem/J2DGraph/J2DPane.h @@ -103,6 +103,7 @@ public: bool isVisible() const { return mVisible; } void show() { mVisible = true; } + void hide() { mVisible = false; } void initiate(); void initialize(J2DPane*, bool, u64, const JGeometry::TBox2<f32>&); diff --git a/include/JSystem/J2DGraph/J2DPicture.h b/include/JSystem/J2DGraph/J2DPicture.h index 2dca4ac374..d75a2b2f2e 100644 --- a/include/JSystem/J2DGraph/J2DPicture.h +++ b/include/JSystem/J2DGraph/J2DPicture.h @@ -63,8 +63,8 @@ public: /* 80053C6C */ virtual void setBlack(JUtility::TColor); /* 80053C44 */ virtual void setWhite(JUtility::TColor); /* 8018BEE0 */ virtual void setBlackWhite(JUtility::TColor, JUtility::TColor); - /* 801DFA4C */ virtual void getBlack() const; - /* 801DFA40 */ virtual void getWhite() const; + /* 801DFA4C */ virtual JUtility::TColor getBlack() const; + /* 801DFA40 */ virtual JUtility::TColor getWhite() const; /* 8025603C */ virtual bool getMaterial() const; /* 802FDBFC */ virtual void drawFullSet(f32, f32, f32, f32, Mtx*); /* 802FE380 */ virtual void drawTexCoord(f32, f32, f32, f32, s16, s16, s16, s16, s16, s16, s16, diff --git a/include/JSystem/J2DGraph/J2DTextBox.h b/include/JSystem/J2DGraph/J2DTextBox.h index b2170c014f..a6b47e64a9 100644 --- a/include/JSystem/J2DGraph/J2DTextBox.h +++ b/include/JSystem/J2DGraph/J2DTextBox.h @@ -19,6 +19,11 @@ enum J2DTextBoxHBinding { class J2DTextBox : public J2DPane { public: + struct TFontSize { + /* 0x0 */ f32 mSizeX; + /* 0x4 */ f32 mSizeY; + }; + /* 803001E0 */ virtual ~J2DTextBox(); /* 80300C68 */ virtual s32 getTypeID() const; /* 80300AF8 */ virtual void resize(f32, f32); @@ -51,6 +56,22 @@ public: /* 8030074C */ s32 setString(s16, char const*, ...); /* 80300660 */ s32 setString(char const*, ...); + void setFontSize(f32 sizeX, f32 sizeY) { + if (sizeX > 0.0f) { + sizeX = 0.0f; + } + field_0x11c = sizeX; + + if (sizeY > 0.0f) { + sizeY = 0.0f; + } + field_0x120 = sizeY; + } + + void setFontSize(TFontSize size) { setFontSize(size.mSizeX, size.mSizeY); } + + void setCharSpace(f32 space) { mCharSpacing = space; } + private: /* 0x0100 */ JUTFont* mFont; /* 0x0104 */ JUtility::TColor mCharColor; |