preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-07-11 09:35:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

UI: Add some missing overrides.

Browse Source
This commit is contained in:
Unknown W. Brackets
2017-06-06 19:50:19 -07:00
parent a6f56769a8
commit e24216e55b
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/TouchControlLayoutScreen.cpp
+9 -13
View File
@@ -48,7 +48,7 @@ public:
scale_ = theScale_;
}
virtual bool IsDown() {
bool IsDown() override {
// Don't want the button to enlarge and throw the user's perspective
// of button size off whack.
return false;
@@ -118,7 +118,7 @@ public:
squareVisible_ = visible;
}
void Draw(UIContext &dc) {
void Draw(UIContext &dc) override {
float opacity = g_Config.iTouchButtonOpacity / 100.0f;
uint32_t colorBg = colorAlpha(GetButtonColor(), opacity);
@@ -151,19 +151,15 @@ public:
}
};
void GetContentDimensions(const UIContext &dc, float &w, float &h) const{
void GetContentDimensions(const UIContext &dc, float &w, float &h) const override {
const AtlasImage &image = dc.Draw()->GetAtlas()->images[roundId_];
w = (2 * baseActionButtonSpacing * spacing_) + image.w * scale_;
h = (2 * baseActionButtonSpacing * spacing_) + image.h * scale_;
}
virtual float GetSpacing() const { return spacing_; }
virtual void SetSpacing(float s) { spacing_ = s; }
virtual void SavePosition() {
DragDropButton::SavePosition();
}
float GetSpacing() const override { return spacing_; }
void SetSpacing(float s) override { spacing_ = s; }
private:
bool circleVisible_, crossVisible_, triangleVisible_, squareVisible_;
@@ -180,7 +176,7 @@ public:
: DragDropButton(x, y, -1, -1, scale), spacing_(spacing) {
}
void Draw(UIContext &dc) {
void Draw(UIContext &dc) override {
float opacity = g_Config.iTouchButtonOpacity / 100.0f;
uint32_t colorBg = colorAlpha(GetButtonColor(), opacity);
@@ -204,14 +200,14 @@ public:
}
}
void GetContentDimensions(const UIContext &dc, float &w, float &h) const{
void GetContentDimensions(const UIContext &dc, float &w, float &h) const override {
const AtlasImage &image = dc.Draw()->GetAtlas()->images[I_DIR];
w = 2 * D_pad_Radius * spacing_ + image.w * scale_;
h = 2 * D_pad_Radius * spacing_ + image.h * scale_;
};
float GetSpacing() const { return spacing_; }
virtual void SetSpacing(float s) { spacing_ = s; }
float GetSpacing() const override { return spacing_; }
void SetSpacing(float s) override { spacing_ = s; }
private:
float &spacing_;