2013-10-19 22:34:48 +00:00
|
|
|
// Copyright (c) 2013- PPSSPP Project.
|
|
|
|
|
|
|
|
// This program is free software: you can redistribute it and/or modify
|
|
|
|
// it under the terms of the GNU General Public License as published by
|
|
|
|
// the Free Software Foundation, version 2.0 or later versions.
|
|
|
|
|
|
|
|
// This program is distributed in the hope that it will be useful,
|
|
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
// GNU General Public License 2.0 for more details.
|
|
|
|
|
|
|
|
// A copy of the GPL 2.0 should have been included with the program.
|
|
|
|
// If not, see http://www.gnu.org/licenses/
|
|
|
|
|
|
|
|
// Official git repository and contact information can be found at
|
|
|
|
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
|
|
|
|
|
2017-06-03 15:41:56 +00:00
|
|
|
#include <algorithm>
|
2013-10-19 22:34:48 +00:00
|
|
|
#include <vector>
|
|
|
|
|
2014-02-10 11:38:23 +00:00
|
|
|
#include "base/colorutil.h"
|
|
|
|
#include "gfx_es2/draw_buffer.h"
|
|
|
|
#include "i18n/i18n.h"
|
|
|
|
#include "ui/ui_context.h"
|
|
|
|
|
2013-10-09 20:15:56 +00:00
|
|
|
#include "TouchControlLayoutScreen.h"
|
2013-10-20 15:33:18 +00:00
|
|
|
#include "TouchControlVisibilityScreen.h"
|
2013-10-09 20:15:56 +00:00
|
|
|
#include "Core/Config.h"
|
|
|
|
#include "Core/System.h"
|
|
|
|
#include "GamepadEmu.h"
|
|
|
|
|
2013-12-02 14:15:19 +00:00
|
|
|
static const int leftColumnWidth = 140;
|
2013-10-09 20:15:56 +00:00
|
|
|
|
2014-02-10 14:55:21 +00:00
|
|
|
// Ugly hackery, need to rework some stuff to get around this
|
|
|
|
static float local_dp_xres;
|
|
|
|
static float local_dp_yres;
|
|
|
|
|
2013-12-10 22:19:37 +00:00
|
|
|
static u32 GetButtonColor() {
|
2018-09-30 23:48:02 +00:00
|
|
|
return g_Config.iTouchButtonStyle != 0 ? 0xFFFFFF : 0xc0b080;
|
2013-12-10 22:19:37 +00:00
|
|
|
}
|
|
|
|
|
2013-10-19 22:34:48 +00:00
|
|
|
class DragDropButton : public MultiTouchButton {
|
2013-10-09 20:15:56 +00:00
|
|
|
public:
|
2020-02-29 20:51:14 +00:00
|
|
|
DragDropButton(ConfigTouchPos &pos, ImageID bgImg, ImageID img)
|
2018-09-30 23:48:02 +00:00
|
|
|
: MultiTouchButton(bgImg, bgImg, img, pos.scale, new UI::AnchorLayoutParams(fromFullscreenCoord(pos.x), pos.y * local_dp_yres, UI::NONE, UI::NONE, true)),
|
2018-06-17 05:14:41 +00:00
|
|
|
x_(pos.x), y_(pos.y), theScale_(pos.scale) {
|
2013-12-02 14:15:19 +00:00
|
|
|
scale_ = theScale_;
|
2013-10-09 20:15:56 +00:00
|
|
|
}
|
|
|
|
|
2017-06-07 02:50:19 +00:00
|
|
|
bool IsDown() override {
|
2013-12-02 14:15:19 +00:00
|
|
|
// Don't want the button to enlarge and throw the user's perspective
|
|
|
|
// of button size off whack.
|
2013-10-09 20:15:56 +00:00
|
|
|
return false;
|
|
|
|
};
|
|
|
|
|
2013-12-02 14:15:19 +00:00
|
|
|
virtual void SavePosition() {
|
2013-10-09 20:15:56 +00:00
|
|
|
x_ = toFullscreenCoord(bounds_.centerX());
|
2014-02-10 14:55:21 +00:00
|
|
|
y_ = bounds_.centerY() / local_dp_yres;
|
2013-12-02 14:15:19 +00:00
|
|
|
scale_ = theScale_;
|
2013-10-09 20:15:56 +00:00
|
|
|
}
|
|
|
|
|
2013-12-02 14:15:19 +00:00
|
|
|
virtual float GetScale() const { return theScale_; }
|
|
|
|
virtual void SetScale(float s) { theScale_ = s; scale_ = s; }
|
|
|
|
|
|
|
|
virtual float GetSpacing() const { return 1.0f; }
|
|
|
|
virtual void SetSpacing(float s) { }
|
|
|
|
|
2017-06-03 15:41:56 +00:00
|
|
|
protected:
|
|
|
|
float GetButtonOpacity() override {
|
|
|
|
float opacity = g_Config.iTouchButtonOpacity / 100.0f;
|
|
|
|
return std::max(0.5f, opacity);
|
|
|
|
}
|
|
|
|
|
2013-10-09 20:15:56 +00:00
|
|
|
private:
|
2014-02-10 11:38:23 +00:00
|
|
|
// convert from screen coordinates (leftColumnWidth to dp_xres) to actual fullscreen coordinates (0 to 1.0)
|
|
|
|
inline float toFullscreenCoord(int screenx) {
|
2014-02-10 14:55:21 +00:00
|
|
|
return (float)(screenx - leftColumnWidth) / (local_dp_xres - leftColumnWidth);
|
2014-02-10 11:38:23 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// convert from external fullscreen coordinates(0 to 1.0) to the current partial coordinates (leftColumnWidth to dp_xres)
|
|
|
|
inline int fromFullscreenCoord(float controllerX) {
|
2014-02-10 14:55:21 +00:00
|
|
|
return leftColumnWidth + (local_dp_xres - leftColumnWidth) * controllerX;
|
2014-02-10 11:38:23 +00:00
|
|
|
};
|
|
|
|
|
2013-11-05 04:52:31 +00:00
|
|
|
float &x_, &y_;
|
2013-12-02 14:15:19 +00:00
|
|
|
float &theScale_;
|
2013-10-09 20:15:56 +00:00
|
|
|
};
|
|
|
|
|
2013-10-19 22:34:48 +00:00
|
|
|
class PSPActionButtons : public DragDropButton {
|
2013-10-09 20:15:56 +00:00
|
|
|
public:
|
2018-06-17 05:14:41 +00:00
|
|
|
PSPActionButtons(ConfigTouchPos &pos, float &spacing)
|
2020-02-29 20:51:14 +00:00
|
|
|
: DragDropButton(pos, ImageID::invalid(), ImageID::invalid()), spacing_(spacing) {
|
2013-10-09 20:15:56 +00:00
|
|
|
using namespace UI;
|
2020-02-29 20:51:14 +00:00
|
|
|
roundId_ = g_Config.iTouchButtonStyle ? ImageID("I_ROUND_LINE") : ImageID("I_ROUND");
|
2013-10-09 20:15:56 +00:00
|
|
|
};
|
|
|
|
|
2013-10-20 10:06:01 +00:00
|
|
|
void setCircleVisibility(bool visible){
|
|
|
|
circleVisible_ = visible;
|
|
|
|
}
|
|
|
|
|
|
|
|
void setCrossVisibility(bool visible){
|
|
|
|
crossVisible_ = visible;
|
|
|
|
}
|
|
|
|
|
|
|
|
void setTriangleVisibility(bool visible){
|
|
|
|
triangleVisible_ = visible;
|
|
|
|
}
|
|
|
|
|
|
|
|
void setSquareVisibility(bool visible){
|
|
|
|
squareVisible_ = visible;
|
|
|
|
}
|
|
|
|
|
2017-06-07 02:50:19 +00:00
|
|
|
void Draw(UIContext &dc) override {
|
2013-10-09 20:15:56 +00:00
|
|
|
float opacity = g_Config.iTouchButtonOpacity / 100.0f;
|
|
|
|
|
2013-12-10 22:19:37 +00:00
|
|
|
uint32_t colorBg = colorAlpha(GetButtonColor(), opacity);
|
2013-10-09 20:15:56 +00:00
|
|
|
uint32_t color = colorAlpha(0xFFFFFF, opacity);
|
|
|
|
|
|
|
|
int centerX = bounds_.centerX();
|
|
|
|
int centerY = bounds_.centerY();
|
|
|
|
|
2013-12-02 14:15:19 +00:00
|
|
|
float spacing = spacing_ * baseActionButtonSpacing;
|
2013-10-20 10:06:01 +00:00
|
|
|
if (circleVisible_) {
|
2013-12-02 14:15:19 +00:00
|
|
|
dc.Draw()->DrawImageRotated(roundId_, centerX + spacing, centerY, scale_, 0, colorBg, false);
|
|
|
|
dc.Draw()->DrawImageRotated(circleId_, centerX + spacing, centerY, scale_, 0, color, false);
|
2013-10-20 10:06:01 +00:00
|
|
|
}
|
2013-10-09 20:15:56 +00:00
|
|
|
|
2013-10-20 10:06:01 +00:00
|
|
|
if (crossVisible_) {
|
2013-12-02 14:15:19 +00:00
|
|
|
dc.Draw()->DrawImageRotated(roundId_, centerX, centerY + spacing, scale_, 0, colorBg, false);
|
|
|
|
dc.Draw()->DrawImageRotated(crossId_, centerX, centerY + spacing, scale_, 0, color, false);
|
2013-10-20 10:06:01 +00:00
|
|
|
}
|
2013-10-09 20:15:56 +00:00
|
|
|
|
2013-10-20 10:06:01 +00:00
|
|
|
if (triangleVisible_) {
|
2013-12-11 19:52:13 +00:00
|
|
|
float y = centerY - spacing;
|
|
|
|
y -= 2.8f * scale_;
|
2013-12-02 14:15:19 +00:00
|
|
|
dc.Draw()->DrawImageRotated(roundId_, centerX, centerY - spacing, scale_, 0, colorBg, false);
|
2013-12-11 19:52:13 +00:00
|
|
|
dc.Draw()->DrawImageRotated(triangleId_, centerX, y, scale_, 0, color, false);
|
2013-10-20 10:06:01 +00:00
|
|
|
}
|
2013-12-02 14:15:19 +00:00
|
|
|
|
|
|
|
if (squareVisible_) {
|
|
|
|
dc.Draw()->DrawImageRotated(roundId_, centerX - spacing, centerY, scale_, 0, colorBg, false);
|
|
|
|
dc.Draw()->DrawImageRotated(squareId_, centerX - spacing, centerY, scale_, 0, color, false);
|
2013-10-20 10:06:01 +00:00
|
|
|
}
|
2013-10-09 20:15:56 +00:00
|
|
|
};
|
|
|
|
|
2017-06-07 02:50:19 +00:00
|
|
|
void GetContentDimensions(const UIContext &dc, float &w, float &h) const override {
|
2020-02-29 20:51:14 +00:00
|
|
|
const AtlasImage *image = dc.Draw()->GetAtlas()->getImage(roundId_);
|
2013-10-09 20:15:56 +00:00
|
|
|
|
2020-02-29 20:51:14 +00:00
|
|
|
w = (2.0f * baseActionButtonSpacing * spacing_) + image->w * scale_;
|
|
|
|
h = (2.0f * baseActionButtonSpacing * spacing_) + image->h * scale_;
|
2013-12-02 14:15:19 +00:00
|
|
|
}
|
2013-10-19 22:34:48 +00:00
|
|
|
|
2017-06-07 02:50:19 +00:00
|
|
|
float GetSpacing() const override { return spacing_; }
|
|
|
|
void SetSpacing(float s) override { spacing_ = s; }
|
2013-10-20 10:06:01 +00:00
|
|
|
|
2013-12-02 14:15:19 +00:00
|
|
|
private:
|
2020-02-29 20:51:14 +00:00
|
|
|
bool circleVisible_ = true, crossVisible_ = true, triangleVisible_ = true, squareVisible_ = true;
|
2013-10-20 10:06:01 +00:00
|
|
|
|
2020-02-29 20:51:14 +00:00
|
|
|
ImageID roundId_ = ImageID::invalid();
|
|
|
|
ImageID circleId_ = ImageID("I_CIRCLE");
|
|
|
|
ImageID crossId_ = ImageID("I_CROSS");
|
|
|
|
ImageID triangleId_ = ImageID("I_TRIANGLE");
|
|
|
|
ImageID squareId_ = ImageID("I_SQUARE");
|
2013-10-09 20:15:56 +00:00
|
|
|
|
2013-12-02 14:15:19 +00:00
|
|
|
float &spacing_;
|
2013-10-09 20:15:56 +00:00
|
|
|
};
|
|
|
|
|
2013-10-19 22:34:48 +00:00
|
|
|
class PSPDPadButtons : public DragDropButton {
|
2013-10-09 20:15:56 +00:00
|
|
|
public:
|
2018-06-17 05:14:41 +00:00
|
|
|
PSPDPadButtons(ConfigTouchPos &pos, float &spacing)
|
2020-02-29 20:51:14 +00:00
|
|
|
: DragDropButton(pos, ImageID::invalid(), ImageID::invalid()), spacing_(spacing) {
|
2013-10-09 20:15:56 +00:00
|
|
|
}
|
|
|
|
|
2017-06-07 02:50:19 +00:00
|
|
|
void Draw(UIContext &dc) override {
|
2013-10-09 20:15:56 +00:00
|
|
|
float opacity = g_Config.iTouchButtonOpacity / 100.0f;
|
|
|
|
|
2013-12-10 22:19:37 +00:00
|
|
|
uint32_t colorBg = colorAlpha(GetButtonColor(), opacity);
|
2013-10-09 20:15:56 +00:00
|
|
|
uint32_t color = colorAlpha(0xFFFFFF, opacity);
|
|
|
|
|
|
|
|
static const float xoff[4] = {1, 0, -1, 0};
|
|
|
|
static const float yoff[4] = {0, 1, 0, -1};
|
|
|
|
|
2020-02-29 20:51:14 +00:00
|
|
|
ImageID dirImage = g_Config.iTouchButtonStyle ? ImageID("I_DIR_LINE") : ImageID("I_DIR");
|
2013-12-10 22:19:37 +00:00
|
|
|
|
2013-10-09 20:15:56 +00:00
|
|
|
for (int i = 0; i < 4; i++) {
|
2013-12-11 19:52:13 +00:00
|
|
|
float r = D_pad_Radius * spacing_;
|
|
|
|
float x = bounds_.centerX() + xoff[i] * r;
|
|
|
|
float y = bounds_.centerY() + yoff[i] * r;
|
|
|
|
float x2 = bounds_.centerX() + xoff[i] * (r + 10.f * scale_);
|
|
|
|
float y2 = bounds_.centerY() + yoff[i] * (r + 10.f * scale_);
|
2013-10-09 20:15:56 +00:00
|
|
|
float angle = i * M_PI / 2;
|
|
|
|
|
2013-12-10 22:19:37 +00:00
|
|
|
dc.Draw()->DrawImageRotated(dirImage, x, y, scale_, angle + PI, colorBg, false);
|
2020-02-29 20:51:14 +00:00
|
|
|
dc.Draw()->DrawImageRotated(ImageID("I_ARROW"), x2, y2, scale_, angle + PI, color);
|
2013-10-09 20:15:56 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-06-07 02:50:19 +00:00
|
|
|
void GetContentDimensions(const UIContext &dc, float &w, float &h) const override {
|
2020-02-29 20:51:14 +00:00
|
|
|
const AtlasImage *image = dc.Draw()->GetAtlas()->getImage(ImageID("I_DIR"));
|
|
|
|
w = 2 * D_pad_Radius * spacing_ + image->w * scale_;
|
|
|
|
h = 2 * D_pad_Radius * spacing_ + image->h * scale_;
|
2013-10-09 20:15:56 +00:00
|
|
|
};
|
2013-12-06 14:29:14 +00:00
|
|
|
|
2017-06-07 02:50:19 +00:00
|
|
|
float GetSpacing() const override { return spacing_; }
|
|
|
|
void SetSpacing(float s) override { spacing_ = s; }
|
2013-10-09 20:15:56 +00:00
|
|
|
|
|
|
|
private:
|
2013-12-02 14:15:19 +00:00
|
|
|
float &spacing_;
|
|
|
|
};
|
2013-10-09 20:15:56 +00:00
|
|
|
|
2020-01-14 18:18:27 +00:00
|
|
|
class SnapGrid : public UI::View {
|
|
|
|
public:
|
|
|
|
SnapGrid(int leftMargin, int rightMargin, int topMargin, int bottomMargin, u32 color) {
|
|
|
|
x1 = leftMargin;
|
|
|
|
x2 = rightMargin;
|
|
|
|
y1 = topMargin;
|
|
|
|
y2 = bottomMargin;
|
|
|
|
col = color;
|
|
|
|
}
|
|
|
|
|
|
|
|
void Draw(UIContext &dc) override {
|
|
|
|
if (g_Config.bTouchSnapToGrid) {
|
2020-01-16 05:16:46 +00:00
|
|
|
dc.Flush();
|
2020-01-15 17:48:43 +00:00
|
|
|
dc.BeginNoTex();
|
2020-01-14 18:18:27 +00:00
|
|
|
for (int x = x1; x < x2; x += g_Config.iTouchSnapGridSize)
|
|
|
|
dc.Draw()->vLine(x, y1, y2, col);
|
|
|
|
for (int y = y1; y < y2; y += g_Config.iTouchSnapGridSize)
|
|
|
|
dc.Draw()->hLine(x1, y, x2, col);
|
2020-01-15 17:48:43 +00:00
|
|
|
dc.Flush();
|
|
|
|
dc.Begin();
|
2020-01-14 18:18:27 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
|
|
|
int x1, x2, y1, y2;
|
|
|
|
u32 col;
|
|
|
|
};
|
|
|
|
|
2013-10-19 22:34:48 +00:00
|
|
|
TouchControlLayoutScreen::TouchControlLayoutScreen() {
|
2013-10-09 20:15:56 +00:00
|
|
|
pickedControl_ = 0;
|
|
|
|
};
|
|
|
|
|
2014-06-15 11:04:59 +00:00
|
|
|
bool TouchControlLayoutScreen::touch(const TouchInput &touch) {
|
2013-10-09 20:15:56 +00:00
|
|
|
UIScreen::touch(touch);
|
|
|
|
|
|
|
|
using namespace UI;
|
|
|
|
|
2013-12-02 14:15:19 +00:00
|
|
|
int mode = mode_->GetSelection();
|
2013-10-09 20:15:56 +00:00
|
|
|
|
2014-02-10 14:55:21 +00:00
|
|
|
const Bounds &screen_bounds = screenManager()->getUIContext()->GetBounds();
|
|
|
|
|
2013-12-02 14:15:19 +00:00
|
|
|
if ((touch.flags & TOUCH_MOVE) && pickedControl_ != 0) {
|
|
|
|
if (mode == 0) {
|
|
|
|
const Bounds &bounds = pickedControl_->GetBounds();
|
|
|
|
|
|
|
|
int mintouchX = leftColumnWidth + bounds.w * 0.5;
|
2014-02-10 14:55:21 +00:00
|
|
|
int maxTouchX = screen_bounds.w - bounds.w * 0.5;
|
2013-12-02 14:15:19 +00:00
|
|
|
|
|
|
|
int minTouchY = bounds.h * 0.5;
|
2014-02-10 14:55:21 +00:00
|
|
|
int maxTouchY = screen_bounds.h - bounds.h * 0.5;
|
2013-12-02 14:15:19 +00:00
|
|
|
|
|
|
|
int newX = bounds.centerX(), newY = bounds.centerY();
|
|
|
|
|
|
|
|
// we have to handle x and y separately since even if x is blocked, y may not be.
|
|
|
|
if (touch.x > mintouchX && touch.x < maxTouchX) {
|
|
|
|
// if the leftmost point of the control is ahead of the margin,
|
|
|
|
// move it. Otherwise, don't.
|
|
|
|
newX = touch.x;
|
2019-12-18 23:41:32 +00:00
|
|
|
// Snap to grid
|
|
|
|
if (g_Config.bTouchSnapToGrid)
|
2019-12-19 00:26:23 +00:00
|
|
|
newX -= (int)(touch.x - bounds.w) % g_Config.iTouchSnapGridSize;
|
2013-12-02 14:15:19 +00:00
|
|
|
}
|
|
|
|
if (touch.y > minTouchY && touch.y < maxTouchY) {
|
|
|
|
newY = touch.y;
|
2019-12-18 23:41:32 +00:00
|
|
|
// Snap to grid
|
|
|
|
if (g_Config.bTouchSnapToGrid)
|
2019-12-19 00:26:23 +00:00
|
|
|
newY -= (int)(touch.y - bounds.h) % g_Config.iTouchSnapGridSize;
|
2013-12-02 14:15:19 +00:00
|
|
|
}
|
|
|
|
pickedControl_->ReplaceLayoutParams(new UI::AnchorLayoutParams(newX, newY, NONE, NONE, true));
|
|
|
|
} else if (mode == 1) {
|
|
|
|
// Resize. Vertical = scaling, horizontal = spacing;
|
|
|
|
// Up should be bigger so let's negate in that direction
|
|
|
|
float diffX = (touch.x - startX_);
|
|
|
|
float diffY = -(touch.y - startY_);
|
|
|
|
|
2020-01-12 10:52:49 +00:00
|
|
|
// Snap to grid
|
|
|
|
if (g_Config.bTouchSnapToGrid) {
|
|
|
|
diffX -= (int)(touch.x - startX_) % (g_Config.iTouchSnapGridSize/2);
|
|
|
|
diffY += (int)(touch.y - startY_) % (g_Config.iTouchSnapGridSize/2);
|
|
|
|
}
|
2013-12-02 14:15:19 +00:00
|
|
|
float movementScale = 0.02f;
|
|
|
|
float newScale = startScale_ + diffY * movementScale;
|
|
|
|
float newSpacing = startSpacing_ + diffX * movementScale;
|
|
|
|
if (newScale > 3.0f) newScale = 3.0f;
|
|
|
|
if (newScale < 0.5f) newScale = 0.5f;
|
|
|
|
if (newSpacing > 3.0f) newSpacing = 3.0f;
|
|
|
|
if (newSpacing < 0.5f) newSpacing = 0.5f;
|
|
|
|
pickedControl_->SetSpacing(newSpacing);
|
|
|
|
pickedControl_->SetScale(newScale);
|
2013-10-09 20:15:56 +00:00
|
|
|
}
|
|
|
|
}
|
2013-10-19 22:34:48 +00:00
|
|
|
if ((touch.flags & TOUCH_DOWN) && pickedControl_ == 0) {
|
2013-10-09 20:15:56 +00:00
|
|
|
pickedControl_ = getPickedControl(touch.x, touch.y);
|
2013-12-02 14:15:19 +00:00
|
|
|
if (pickedControl_) {
|
|
|
|
startX_ = touch.x;
|
|
|
|
startY_ = touch.y;
|
|
|
|
startSpacing_ = pickedControl_->GetSpacing();
|
|
|
|
startScale_ = pickedControl_->GetScale();
|
|
|
|
}
|
2013-10-09 20:15:56 +00:00
|
|
|
}
|
2013-10-19 22:34:48 +00:00
|
|
|
if ((touch.flags & TOUCH_UP) && pickedControl_ != 0) {
|
2013-10-09 20:15:56 +00:00
|
|
|
pickedControl_->SavePosition();
|
|
|
|
pickedControl_ = 0;
|
2013-10-19 22:34:48 +00:00
|
|
|
}
|
2014-06-15 11:04:59 +00:00
|
|
|
return true;
|
2017-12-27 09:13:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void TouchControlLayoutScreen::resized() {
|
|
|
|
RecreateViews();
|
|
|
|
}
|
2013-10-09 20:15:56 +00:00
|
|
|
|
2013-10-25 11:19:08 +00:00
|
|
|
void TouchControlLayoutScreen::onFinish(DialogResult reason) {
|
2019-02-23 09:49:49 +00:00
|
|
|
g_Config.Save("TouchControlLayoutScreen::onFinish");
|
2013-10-25 11:19:08 +00:00
|
|
|
}
|
|
|
|
|
2013-10-20 15:33:18 +00:00
|
|
|
UI::EventReturn TouchControlLayoutScreen::OnVisibility(UI::EventParams &e) {
|
|
|
|
screenManager()->push(new TouchControlVisibilityScreen());
|
|
|
|
return UI::EVENT_DONE;
|
|
|
|
}
|
|
|
|
|
2013-10-19 22:34:48 +00:00
|
|
|
UI::EventReturn TouchControlLayoutScreen::OnReset(UI::EventParams &e) {
|
2013-12-02 14:15:19 +00:00
|
|
|
ILOG("Resetting touch control layout");
|
2013-12-12 13:52:46 +00:00
|
|
|
g_Config.ResetControlLayout();
|
2014-02-10 14:55:21 +00:00
|
|
|
const Bounds &bounds = screenManager()->getUIContext()->GetBounds();
|
|
|
|
InitPadLayout(bounds.w, bounds.h);
|
2013-10-19 22:34:48 +00:00
|
|
|
RecreateViews();
|
|
|
|
return UI::EVENT_DONE;
|
|
|
|
};
|
2013-10-09 20:15:56 +00:00
|
|
|
|
2013-10-20 15:33:18 +00:00
|
|
|
void TouchControlLayoutScreen::dialogFinished(const Screen *dialog, DialogResult result) {
|
|
|
|
RecreateViews();
|
|
|
|
}
|
|
|
|
|
2013-10-19 22:34:48 +00:00
|
|
|
void TouchControlLayoutScreen::CreateViews() {
|
|
|
|
// setup g_Config for button layout
|
2014-02-10 14:55:21 +00:00
|
|
|
const Bounds &bounds = screenManager()->getUIContext()->GetBounds();
|
|
|
|
InitPadLayout(bounds.w, bounds.h);
|
|
|
|
|
|
|
|
local_dp_xres = bounds.w;
|
|
|
|
local_dp_yres = bounds.h;
|
2013-10-09 20:15:56 +00:00
|
|
|
|
|
|
|
using namespace UI;
|
|
|
|
|
2020-01-26 18:43:18 +00:00
|
|
|
auto co = GetI18NCategory("Controls");
|
|
|
|
auto di = GetI18NCategory("Dialog");
|
2013-10-09 20:15:56 +00:00
|
|
|
|
|
|
|
root_ = new AnchorLayout(new LayoutParams(FILL_PARENT, FILL_PARENT));
|
|
|
|
|
2015-07-01 21:26:55 +00:00
|
|
|
Choice *reset = new Choice(di->T("Reset"), "", false, new AnchorLayoutParams(leftColumnWidth, WRAP_CONTENT, 10, NONE, NONE, 84));
|
|
|
|
Choice *back = new Choice(di->T("Back"), "", false, new AnchorLayoutParams(leftColumnWidth, WRAP_CONTENT, 10, NONE, NONE, 10));
|
2019-12-18 23:41:32 +00:00
|
|
|
Choice *visibility = new Choice(co->T("Visibility"), "", false, new AnchorLayoutParams(leftColumnWidth, WRAP_CONTENT, 10, NONE, NONE, 298));
|
2015-07-01 20:31:04 +00:00
|
|
|
// controlsSettings->Add(new PopupSliderChoiceFloat(&g_Config.fButtonScale, 0.80, 2.0, co->T("Button Scaling"), screenManager()))
|
2013-12-02 14:15:19 +00:00
|
|
|
// ->OnChange.Handle(this, &GameSettingsScreen::OnChangeControlScaling);
|
|
|
|
|
2019-12-18 23:41:32 +00:00
|
|
|
CheckBox *snap = new CheckBox(&g_Config.bTouchSnapToGrid, di->T("Snap"), "", new AnchorLayoutParams(leftColumnWidth, WRAP_CONTENT, 10, NONE, NONE, 228));
|
2020-01-12 13:28:51 +00:00
|
|
|
PopupSliderChoice *gridSize = new PopupSliderChoice(&g_Config.iTouchSnapGridSize, 2, 256, di->T("Grid"), screenManager(), "", new AnchorLayoutParams(leftColumnWidth, WRAP_CONTENT, 10, NONE, NONE, 158));
|
2019-12-19 08:05:08 +00:00
|
|
|
gridSize->SetEnabledPtr(&g_Config.bTouchSnapToGrid);
|
2019-12-18 23:41:32 +00:00
|
|
|
|
|
|
|
mode_ = new ChoiceStrip(ORIENT_VERTICAL, new AnchorLayoutParams(leftColumnWidth, WRAP_CONTENT, 10, NONE, NONE, 140 + 158 + 64 + 10));
|
2015-07-01 21:26:55 +00:00
|
|
|
mode_->AddChoice(di->T("Move"));
|
|
|
|
mode_->AddChoice(di->T("Resize"));
|
2013-12-02 14:15:19 +00:00
|
|
|
mode_->SetSelection(0);
|
|
|
|
|
2013-10-19 22:34:48 +00:00
|
|
|
reset->OnClick.Handle(this, &TouchControlLayoutScreen::OnReset);
|
2013-10-28 15:04:53 +00:00
|
|
|
back->OnClick.Handle<UIScreen>(this, &UIScreen::OnBack);
|
2013-10-20 15:33:18 +00:00
|
|
|
visibility->OnClick.Handle(this, &TouchControlLayoutScreen::OnVisibility);
|
2013-12-02 14:15:19 +00:00
|
|
|
root_->Add(mode_);
|
2013-10-20 15:33:18 +00:00
|
|
|
root_->Add(visibility);
|
2019-12-18 23:41:32 +00:00
|
|
|
root_->Add(snap);
|
|
|
|
root_->Add(gridSize);
|
2013-10-19 22:34:48 +00:00
|
|
|
root_->Add(reset);
|
2013-10-09 20:15:56 +00:00
|
|
|
root_->Add(back);
|
|
|
|
|
2013-12-02 14:15:19 +00:00
|
|
|
TabHolder *tabHolder = new TabHolder(ORIENT_VERTICAL, leftColumnWidth, new AnchorLayoutParams(10, 0, 10, 0, false));
|
2016-01-23 06:38:21 +00:00
|
|
|
tabHolder->SetTag("TouchControlLayout");
|
2013-10-09 20:15:56 +00:00
|
|
|
root_->Add(tabHolder);
|
|
|
|
|
2013-10-28 15:04:53 +00:00
|
|
|
// this is more for show than anything else. It's used to provide a boundary
|
|
|
|
// so that buttons like back can be placed within the boundary.
|
|
|
|
// serves no other purpose.
|
2013-10-09 20:15:56 +00:00
|
|
|
AnchorLayout *controlsHolder = new AnchorLayout(new LayoutParams(FILL_PARENT, FILL_PARENT));
|
|
|
|
|
2020-01-26 18:43:18 +00:00
|
|
|
auto ms = GetI18NCategory("MainSettings");
|
2013-10-20 10:06:01 +00:00
|
|
|
|
2019-12-19 10:56:42 +00:00
|
|
|
//tabHolder->AddTab(ms->T("Controls"), controlsHolder);
|
2013-10-20 10:06:01 +00:00
|
|
|
|
2013-12-02 14:15:19 +00:00
|
|
|
if (!g_Config.bShowTouchControls) {
|
|
|
|
// Shouldn't even be able to get here as the way into this dialog should be closed.
|
2013-10-20 10:06:01 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-10-19 22:34:48 +00:00
|
|
|
controls_.clear();
|
2013-10-09 20:15:56 +00:00
|
|
|
|
2018-06-17 05:14:41 +00:00
|
|
|
PSPActionButtons *actionButtons = new PSPActionButtons(g_Config.touchActionButtonCenter, g_Config.fActionButtonSpacing);
|
2013-10-20 10:06:01 +00:00
|
|
|
actionButtons->setCircleVisibility(g_Config.bShowTouchCircle);
|
|
|
|
actionButtons->setCrossVisibility(g_Config.bShowTouchCross);
|
|
|
|
actionButtons->setTriangleVisibility(g_Config.bShowTouchTriangle);
|
|
|
|
actionButtons->setSquareVisibility(g_Config.bShowTouchSquare);
|
|
|
|
|
|
|
|
controls_.push_back(actionButtons);
|
2013-10-20 15:33:18 +00:00
|
|
|
|
2020-02-29 20:51:14 +00:00
|
|
|
ImageID rectImage = g_Config.iTouchButtonStyle ? ImageID("I_RECT_LINE") : ImageID("I_RECT");
|
|
|
|
ImageID shoulderImage = g_Config.iTouchButtonStyle ? ImageID("I_SHOULDER_LINE") : ImageID("I_SHOULDER");
|
|
|
|
ImageID dirImage = g_Config.iTouchButtonStyle ? ImageID("I_DIR_LINE") : ImageID("I_DIR");
|
|
|
|
ImageID stickImage = g_Config.iTouchButtonStyle ? ImageID("I_STICK_LINE") : ImageID("I_STICK");
|
|
|
|
ImageID stickBg = g_Config.iTouchButtonStyle ? ImageID("I_STICK_BG_LINE") : ImageID("I_STICK_BG");
|
|
|
|
ImageID roundImage = g_Config.iTouchButtonStyle ? ImageID("I_ROUND_LINE") : ImageID("I_ROUND");
|
2015-06-28 05:34:05 +00:00
|
|
|
|
2020-02-29 20:51:14 +00:00
|
|
|
const ImageID comboKeyImages[5] = { ImageID("I_1"), ImageID("I_2"), ImageID("I_3"), ImageID("I_4"), ImageID("I_5") };
|
2013-12-10 22:19:37 +00:00
|
|
|
|
2018-06-17 05:14:41 +00:00
|
|
|
if (g_Config.touchDpad.show) {
|
|
|
|
controls_.push_back(new PSPDPadButtons(g_Config.touchDpad, g_Config.fDpadSpacing));
|
2013-10-20 10:06:01 +00:00
|
|
|
}
|
|
|
|
|
2018-06-17 05:14:41 +00:00
|
|
|
if (g_Config.touchSelectKey.show) {
|
2020-02-29 20:51:14 +00:00
|
|
|
controls_.push_back(new DragDropButton(g_Config.touchSelectKey, rectImage, ImageID("I_SELECT")));
|
2013-10-20 15:33:18 +00:00
|
|
|
}
|
|
|
|
|
2018-06-17 05:14:41 +00:00
|
|
|
if (g_Config.touchStartKey.show) {
|
2020-02-29 20:51:14 +00:00
|
|
|
controls_.push_back(new DragDropButton(g_Config.touchStartKey, rectImage, ImageID("I_START")));
|
2013-10-20 15:33:18 +00:00
|
|
|
}
|
|
|
|
|
2018-06-17 05:14:41 +00:00
|
|
|
if (g_Config.touchUnthrottleKey.show) {
|
2020-02-29 20:51:14 +00:00
|
|
|
DragDropButton *unthrottle = new DragDropButton(g_Config.touchUnthrottleKey, rectImage, ImageID("I_ARROW"));
|
2013-10-20 10:06:01 +00:00
|
|
|
unthrottle->SetAngle(180.0f);
|
|
|
|
controls_.push_back(unthrottle);
|
|
|
|
}
|
|
|
|
|
2018-06-17 06:00:21 +00:00
|
|
|
if (g_Config.touchSpeed1Key.show) {
|
2020-02-29 20:51:14 +00:00
|
|
|
DragDropButton *speed1 = new DragDropButton(g_Config.touchSpeed1Key, rectImage, ImageID("I_ARROW"));
|
2018-06-17 06:00:21 +00:00
|
|
|
speed1->SetAngle(170.0f, 180.0f);
|
|
|
|
controls_.push_back(speed1);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (g_Config.touchSpeed2Key.show) {
|
2020-02-29 20:51:14 +00:00
|
|
|
DragDropButton *speed2 = new DragDropButton(g_Config.touchSpeed2Key, rectImage, ImageID("I_ARROW"));
|
2018-06-17 06:00:21 +00:00
|
|
|
speed2->SetAngle(190.0f, 180.0f);
|
|
|
|
controls_.push_back(speed2);
|
|
|
|
}
|
|
|
|
|
2020-01-28 07:52:18 +00:00
|
|
|
if (g_Config.touchRapidFireKey.show) {
|
2020-02-29 20:51:14 +00:00
|
|
|
DragDropButton *rapidFire = new DragDropButton(g_Config.touchRapidFireKey, rectImage, ImageID("I_ARROW"));
|
2020-01-28 07:52:18 +00:00
|
|
|
rapidFire->SetAngle(90.0f, 180.0f);
|
|
|
|
controls_.push_back(rapidFire);
|
|
|
|
}
|
|
|
|
|
2020-03-22 23:45:22 +00:00
|
|
|
if (g_Config.touchAnalogRotationKey.show) {
|
|
|
|
DragDropButton *analogRotation = new DragDropButton(g_Config.touchAnalogRotationKey, rectImage, ImageID("I_R"));
|
|
|
|
controls_.push_back(analogRotation);
|
|
|
|
}
|
|
|
|
|
2018-06-17 05:14:41 +00:00
|
|
|
if (g_Config.touchLKey.show) {
|
2020-02-29 20:51:14 +00:00
|
|
|
controls_.push_back(new DragDropButton(g_Config.touchLKey, shoulderImage, ImageID("I_L")));
|
2013-10-20 15:33:18 +00:00
|
|
|
}
|
|
|
|
|
2018-06-17 05:14:41 +00:00
|
|
|
if (g_Config.touchRKey.show) {
|
2020-02-29 20:51:14 +00:00
|
|
|
DragDropButton *rbutton = new DragDropButton(g_Config.touchRKey, shoulderImage, ImageID("I_R"));
|
2013-10-20 10:06:01 +00:00
|
|
|
rbutton->FlipImageH(true);
|
|
|
|
controls_.push_back(rbutton);
|
|
|
|
}
|
2013-10-09 20:15:56 +00:00
|
|
|
|
2018-06-17 05:14:41 +00:00
|
|
|
if (g_Config.touchAnalogStick.show) {
|
|
|
|
controls_.push_back(new DragDropButton(g_Config.touchAnalogStick, stickBg, stickImage));
|
2015-06-28 05:34:05 +00:00
|
|
|
}
|
2019-07-18 01:16:46 +00:00
|
|
|
if (g_Config.touchRightAnalogStick.show) {
|
|
|
|
controls_.push_back(new DragDropButton(g_Config.touchRightAnalogStick, stickBg, stickImage));
|
|
|
|
}
|
2018-06-17 05:14:41 +00:00
|
|
|
if (g_Config.touchCombo0.show) {
|
|
|
|
controls_.push_back(new DragDropButton(g_Config.touchCombo0, roundImage, comboKeyImages[0]));
|
2015-06-28 05:34:05 +00:00
|
|
|
}
|
2018-06-17 05:14:41 +00:00
|
|
|
if (g_Config.touchCombo1.show) {
|
|
|
|
controls_.push_back(new DragDropButton(g_Config.touchCombo1, roundImage, comboKeyImages[1]));
|
2015-06-28 05:34:05 +00:00
|
|
|
}
|
2018-06-17 05:14:41 +00:00
|
|
|
if (g_Config.touchCombo2.show) {
|
|
|
|
controls_.push_back(new DragDropButton(g_Config.touchCombo2, roundImage, comboKeyImages[2]));
|
2015-06-28 05:34:05 +00:00
|
|
|
}
|
2018-06-17 05:14:41 +00:00
|
|
|
if (g_Config.touchCombo3.show) {
|
|
|
|
controls_.push_back(new DragDropButton(g_Config.touchCombo3, roundImage, comboKeyImages[3]));
|
2015-06-28 05:34:05 +00:00
|
|
|
}
|
2018-06-17 05:14:41 +00:00
|
|
|
if (g_Config.touchCombo4.show) {
|
|
|
|
controls_.push_back(new DragDropButton(g_Config.touchCombo4, roundImage, comboKeyImages[4]));
|
2013-10-09 20:15:56 +00:00
|
|
|
};
|
|
|
|
|
2013-10-19 22:34:48 +00:00
|
|
|
for (size_t i = 0; i < controls_.size(); i++) {
|
|
|
|
root_->Add(controls_[i]);
|
2013-10-09 20:15:56 +00:00
|
|
|
}
|
2020-01-16 05:16:46 +00:00
|
|
|
|
|
|
|
root_->Add(new SnapGrid(leftColumnWidth+10, bounds.w, 0, bounds.h, 0x3FFFFFFF));
|
2013-10-20 15:33:18 +00:00
|
|
|
}
|
2013-10-09 20:15:56 +00:00
|
|
|
|
2013-10-19 22:34:48 +00:00
|
|
|
// return the control which was picked up by the touchEvent. If a control
|
|
|
|
// was already picked up, then it's being dragged around, so just return that instead
|
|
|
|
DragDropButton *TouchControlLayoutScreen::getPickedControl(const int x, const int y) {
|
|
|
|
if (pickedControl_ != 0) {
|
2013-10-09 20:15:56 +00:00
|
|
|
return pickedControl_;
|
|
|
|
}
|
|
|
|
|
2013-10-19 22:34:48 +00:00
|
|
|
for (size_t i = 0; i < controls_.size(); i++) {
|
|
|
|
DragDropButton *control = controls_[i];
|
2013-10-09 20:15:56 +00:00
|
|
|
const Bounds &bounds = control->GetBounds();
|
2013-10-31 12:34:34 +00:00
|
|
|
const float thresholdFactor = 1.5f;
|
2013-10-09 20:15:56 +00:00
|
|
|
|
|
|
|
Bounds tolerantBounds(bounds.x, bounds.y, bounds.w * thresholdFactor, bounds.h * thresholdFactor);
|
2013-10-19 22:34:48 +00:00
|
|
|
if (tolerantBounds.Contains(x, y)) {
|
2013-10-09 20:15:56 +00:00
|
|
|
return control;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|