mirror of
https://github.com/libretro/ppsspp.git
synced 2024-11-23 16:19:44 +00:00
45d94c4877
SLN fix It works, but with the wrong images and the wrong characters! Fix another bug in atlastool's binary output Get Android building again. Oops, didn't mean to disable this permanently. Error checking Minor cleanup Gotta tweak my git ignores... Regenerate metadata
516 lines
18 KiB
C++
516 lines
18 KiB
C++
// 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/.
|
|
|
|
#include <algorithm>
|
|
#include <vector>
|
|
|
|
#include "base/colorutil.h"
|
|
#include "gfx_es2/draw_buffer.h"
|
|
#include "i18n/i18n.h"
|
|
#include "ui/ui_context.h"
|
|
|
|
#include "TouchControlLayoutScreen.h"
|
|
#include "TouchControlVisibilityScreen.h"
|
|
#include "Core/Config.h"
|
|
#include "Core/System.h"
|
|
#include "GamepadEmu.h"
|
|
|
|
static const int leftColumnWidth = 140;
|
|
|
|
// Ugly hackery, need to rework some stuff to get around this
|
|
static float local_dp_xres;
|
|
static float local_dp_yres;
|
|
|
|
static u32 GetButtonColor() {
|
|
return g_Config.iTouchButtonStyle != 0 ? 0xFFFFFF : 0xc0b080;
|
|
}
|
|
|
|
class DragDropButton : public MultiTouchButton {
|
|
public:
|
|
DragDropButton(ConfigTouchPos &pos, ImageID bgImg, ImageID img)
|
|
: MultiTouchButton(bgImg, bgImg, img, pos.scale, new UI::AnchorLayoutParams(fromFullscreenCoord(pos.x), pos.y * local_dp_yres, UI::NONE, UI::NONE, true)),
|
|
x_(pos.x), y_(pos.y), theScale_(pos.scale) {
|
|
scale_ = theScale_;
|
|
}
|
|
|
|
bool IsDown() override {
|
|
// Don't want the button to enlarge and throw the user's perspective
|
|
// of button size off whack.
|
|
return false;
|
|
};
|
|
|
|
virtual void SavePosition() {
|
|
x_ = toFullscreenCoord(bounds_.centerX());
|
|
y_ = bounds_.centerY() / local_dp_yres;
|
|
scale_ = theScale_;
|
|
}
|
|
|
|
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) { }
|
|
|
|
protected:
|
|
float GetButtonOpacity() override {
|
|
float opacity = g_Config.iTouchButtonOpacity / 100.0f;
|
|
return std::max(0.5f, opacity);
|
|
}
|
|
|
|
private:
|
|
// convert from screen coordinates (leftColumnWidth to dp_xres) to actual fullscreen coordinates (0 to 1.0)
|
|
inline float toFullscreenCoord(int screenx) {
|
|
return (float)(screenx - leftColumnWidth) / (local_dp_xres - leftColumnWidth);
|
|
}
|
|
|
|
// convert from external fullscreen coordinates(0 to 1.0) to the current partial coordinates (leftColumnWidth to dp_xres)
|
|
inline int fromFullscreenCoord(float controllerX) {
|
|
return leftColumnWidth + (local_dp_xres - leftColumnWidth) * controllerX;
|
|
};
|
|
|
|
float &x_, &y_;
|
|
float &theScale_;
|
|
};
|
|
|
|
class PSPActionButtons : public DragDropButton {
|
|
public:
|
|
PSPActionButtons(ConfigTouchPos &pos, float &spacing)
|
|
: DragDropButton(pos, ImageID::invalid(), ImageID::invalid()), spacing_(spacing) {
|
|
using namespace UI;
|
|
roundId_ = g_Config.iTouchButtonStyle ? ImageID("I_ROUND_LINE") : ImageID("I_ROUND");
|
|
};
|
|
|
|
void setCircleVisibility(bool visible){
|
|
circleVisible_ = visible;
|
|
}
|
|
|
|
void setCrossVisibility(bool visible){
|
|
crossVisible_ = visible;
|
|
}
|
|
|
|
void setTriangleVisibility(bool visible){
|
|
triangleVisible_ = visible;
|
|
}
|
|
|
|
void setSquareVisibility(bool visible){
|
|
squareVisible_ = visible;
|
|
}
|
|
|
|
void Draw(UIContext &dc) override {
|
|
float opacity = g_Config.iTouchButtonOpacity / 100.0f;
|
|
|
|
uint32_t colorBg = colorAlpha(GetButtonColor(), opacity);
|
|
uint32_t color = colorAlpha(0xFFFFFF, opacity);
|
|
|
|
int centerX = bounds_.centerX();
|
|
int centerY = bounds_.centerY();
|
|
|
|
float spacing = spacing_ * baseActionButtonSpacing;
|
|
if (circleVisible_) {
|
|
dc.Draw()->DrawImageRotated(roundId_, centerX + spacing, centerY, scale_, 0, colorBg, false);
|
|
dc.Draw()->DrawImageRotated(circleId_, centerX + spacing, centerY, scale_, 0, color, false);
|
|
}
|
|
|
|
if (crossVisible_) {
|
|
dc.Draw()->DrawImageRotated(roundId_, centerX, centerY + spacing, scale_, 0, colorBg, false);
|
|
dc.Draw()->DrawImageRotated(crossId_, centerX, centerY + spacing, scale_, 0, color, false);
|
|
}
|
|
|
|
if (triangleVisible_) {
|
|
float y = centerY - spacing;
|
|
y -= 2.8f * scale_;
|
|
dc.Draw()->DrawImageRotated(roundId_, centerX, centerY - spacing, scale_, 0, colorBg, false);
|
|
dc.Draw()->DrawImageRotated(triangleId_, centerX, y, scale_, 0, color, false);
|
|
}
|
|
|
|
if (squareVisible_) {
|
|
dc.Draw()->DrawImageRotated(roundId_, centerX - spacing, centerY, scale_, 0, colorBg, false);
|
|
dc.Draw()->DrawImageRotated(squareId_, centerX - spacing, centerY, scale_, 0, color, false);
|
|
}
|
|
};
|
|
|
|
void GetContentDimensions(const UIContext &dc, float &w, float &h) const override {
|
|
const AtlasImage *image = dc.Draw()->GetAtlas()->getImage(roundId_);
|
|
|
|
w = (2.0f * baseActionButtonSpacing * spacing_) + image->w * scale_;
|
|
h = (2.0f * baseActionButtonSpacing * spacing_) + image->h * scale_;
|
|
}
|
|
|
|
float GetSpacing() const override { return spacing_; }
|
|
void SetSpacing(float s) override { spacing_ = s; }
|
|
|
|
private:
|
|
bool circleVisible_ = true, crossVisible_ = true, triangleVisible_ = true, squareVisible_ = true;
|
|
|
|
ImageID roundId_ = ImageID::invalid();
|
|
ImageID circleId_ = ImageID("I_CIRCLE");
|
|
ImageID crossId_ = ImageID("I_CROSS");
|
|
ImageID triangleId_ = ImageID("I_TRIANGLE");
|
|
ImageID squareId_ = ImageID("I_SQUARE");
|
|
|
|
float &spacing_;
|
|
};
|
|
|
|
class PSPDPadButtons : public DragDropButton {
|
|
public:
|
|
PSPDPadButtons(ConfigTouchPos &pos, float &spacing)
|
|
: DragDropButton(pos, ImageID::invalid(), ImageID::invalid()), spacing_(spacing) {
|
|
}
|
|
|
|
void Draw(UIContext &dc) override {
|
|
float opacity = g_Config.iTouchButtonOpacity / 100.0f;
|
|
|
|
uint32_t colorBg = colorAlpha(GetButtonColor(), opacity);
|
|
uint32_t color = colorAlpha(0xFFFFFF, opacity);
|
|
|
|
static const float xoff[4] = {1, 0, -1, 0};
|
|
static const float yoff[4] = {0, 1, 0, -1};
|
|
|
|
ImageID dirImage = g_Config.iTouchButtonStyle ? ImageID("I_DIR_LINE") : ImageID("I_DIR");
|
|
|
|
for (int i = 0; i < 4; i++) {
|
|
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_);
|
|
float angle = i * M_PI / 2;
|
|
|
|
dc.Draw()->DrawImageRotated(dirImage, x, y, scale_, angle + PI, colorBg, false);
|
|
dc.Draw()->DrawImageRotated(ImageID("I_ARROW"), x2, y2, scale_, angle + PI, color);
|
|
}
|
|
}
|
|
|
|
void GetContentDimensions(const UIContext &dc, float &w, float &h) const override {
|
|
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_;
|
|
};
|
|
|
|
float GetSpacing() const override { return spacing_; }
|
|
void SetSpacing(float s) override { spacing_ = s; }
|
|
|
|
private:
|
|
float &spacing_;
|
|
};
|
|
|
|
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) {
|
|
dc.Flush();
|
|
dc.BeginNoTex();
|
|
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);
|
|
dc.Flush();
|
|
dc.Begin();
|
|
}
|
|
}
|
|
|
|
private:
|
|
int x1, x2, y1, y2;
|
|
u32 col;
|
|
};
|
|
|
|
TouchControlLayoutScreen::TouchControlLayoutScreen() {
|
|
pickedControl_ = 0;
|
|
};
|
|
|
|
bool TouchControlLayoutScreen::touch(const TouchInput &touch) {
|
|
UIScreen::touch(touch);
|
|
|
|
using namespace UI;
|
|
|
|
int mode = mode_->GetSelection();
|
|
|
|
const Bounds &screen_bounds = screenManager()->getUIContext()->GetBounds();
|
|
|
|
if ((touch.flags & TOUCH_MOVE) && pickedControl_ != 0) {
|
|
if (mode == 0) {
|
|
const Bounds &bounds = pickedControl_->GetBounds();
|
|
|
|
int mintouchX = leftColumnWidth + bounds.w * 0.5;
|
|
int maxTouchX = screen_bounds.w - bounds.w * 0.5;
|
|
|
|
int minTouchY = bounds.h * 0.5;
|
|
int maxTouchY = screen_bounds.h - bounds.h * 0.5;
|
|
|
|
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;
|
|
// Snap to grid
|
|
if (g_Config.bTouchSnapToGrid)
|
|
newX -= (int)(touch.x - bounds.w) % g_Config.iTouchSnapGridSize;
|
|
}
|
|
if (touch.y > minTouchY && touch.y < maxTouchY) {
|
|
newY = touch.y;
|
|
// Snap to grid
|
|
if (g_Config.bTouchSnapToGrid)
|
|
newY -= (int)(touch.y - bounds.h) % g_Config.iTouchSnapGridSize;
|
|
}
|
|
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_);
|
|
|
|
// 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);
|
|
}
|
|
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);
|
|
}
|
|
}
|
|
if ((touch.flags & TOUCH_DOWN) && pickedControl_ == 0) {
|
|
pickedControl_ = getPickedControl(touch.x, touch.y);
|
|
if (pickedControl_) {
|
|
startX_ = touch.x;
|
|
startY_ = touch.y;
|
|
startSpacing_ = pickedControl_->GetSpacing();
|
|
startScale_ = pickedControl_->GetScale();
|
|
}
|
|
}
|
|
if ((touch.flags & TOUCH_UP) && pickedControl_ != 0) {
|
|
pickedControl_->SavePosition();
|
|
pickedControl_ = 0;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
void TouchControlLayoutScreen::resized() {
|
|
RecreateViews();
|
|
}
|
|
|
|
void TouchControlLayoutScreen::onFinish(DialogResult reason) {
|
|
g_Config.Save("TouchControlLayoutScreen::onFinish");
|
|
}
|
|
|
|
UI::EventReturn TouchControlLayoutScreen::OnVisibility(UI::EventParams &e) {
|
|
screenManager()->push(new TouchControlVisibilityScreen());
|
|
return UI::EVENT_DONE;
|
|
}
|
|
|
|
UI::EventReturn TouchControlLayoutScreen::OnReset(UI::EventParams &e) {
|
|
ILOG("Resetting touch control layout");
|
|
g_Config.ResetControlLayout();
|
|
const Bounds &bounds = screenManager()->getUIContext()->GetBounds();
|
|
InitPadLayout(bounds.w, bounds.h);
|
|
RecreateViews();
|
|
return UI::EVENT_DONE;
|
|
};
|
|
|
|
void TouchControlLayoutScreen::dialogFinished(const Screen *dialog, DialogResult result) {
|
|
RecreateViews();
|
|
}
|
|
|
|
void TouchControlLayoutScreen::CreateViews() {
|
|
// setup g_Config for button layout
|
|
const Bounds &bounds = screenManager()->getUIContext()->GetBounds();
|
|
InitPadLayout(bounds.w, bounds.h);
|
|
|
|
local_dp_xres = bounds.w;
|
|
local_dp_yres = bounds.h;
|
|
|
|
using namespace UI;
|
|
|
|
auto co = GetI18NCategory("Controls");
|
|
auto di = GetI18NCategory("Dialog");
|
|
|
|
root_ = new AnchorLayout(new LayoutParams(FILL_PARENT, FILL_PARENT));
|
|
|
|
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));
|
|
Choice *visibility = new Choice(co->T("Visibility"), "", false, new AnchorLayoutParams(leftColumnWidth, WRAP_CONTENT, 10, NONE, NONE, 298));
|
|
// controlsSettings->Add(new PopupSliderChoiceFloat(&g_Config.fButtonScale, 0.80, 2.0, co->T("Button Scaling"), screenManager()))
|
|
// ->OnChange.Handle(this, &GameSettingsScreen::OnChangeControlScaling);
|
|
|
|
CheckBox *snap = new CheckBox(&g_Config.bTouchSnapToGrid, di->T("Snap"), "", new AnchorLayoutParams(leftColumnWidth, WRAP_CONTENT, 10, NONE, NONE, 228));
|
|
PopupSliderChoice *gridSize = new PopupSliderChoice(&g_Config.iTouchSnapGridSize, 2, 256, di->T("Grid"), screenManager(), "", new AnchorLayoutParams(leftColumnWidth, WRAP_CONTENT, 10, NONE, NONE, 158));
|
|
gridSize->SetEnabledPtr(&g_Config.bTouchSnapToGrid);
|
|
|
|
mode_ = new ChoiceStrip(ORIENT_VERTICAL, new AnchorLayoutParams(leftColumnWidth, WRAP_CONTENT, 10, NONE, NONE, 140 + 158 + 64 + 10));
|
|
mode_->AddChoice(di->T("Move"));
|
|
mode_->AddChoice(di->T("Resize"));
|
|
mode_->SetSelection(0);
|
|
|
|
reset->OnClick.Handle(this, &TouchControlLayoutScreen::OnReset);
|
|
back->OnClick.Handle<UIScreen>(this, &UIScreen::OnBack);
|
|
visibility->OnClick.Handle(this, &TouchControlLayoutScreen::OnVisibility);
|
|
root_->Add(mode_);
|
|
root_->Add(visibility);
|
|
root_->Add(snap);
|
|
root_->Add(gridSize);
|
|
root_->Add(reset);
|
|
root_->Add(back);
|
|
|
|
TabHolder *tabHolder = new TabHolder(ORIENT_VERTICAL, leftColumnWidth, new AnchorLayoutParams(10, 0, 10, 0, false));
|
|
tabHolder->SetTag("TouchControlLayout");
|
|
root_->Add(tabHolder);
|
|
|
|
// 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.
|
|
AnchorLayout *controlsHolder = new AnchorLayout(new LayoutParams(FILL_PARENT, FILL_PARENT));
|
|
|
|
auto ms = GetI18NCategory("MainSettings");
|
|
|
|
//tabHolder->AddTab(ms->T("Controls"), controlsHolder);
|
|
|
|
if (!g_Config.bShowTouchControls) {
|
|
// Shouldn't even be able to get here as the way into this dialog should be closed.
|
|
return;
|
|
}
|
|
|
|
controls_.clear();
|
|
|
|
PSPActionButtons *actionButtons = new PSPActionButtons(g_Config.touchActionButtonCenter, g_Config.fActionButtonSpacing);
|
|
actionButtons->setCircleVisibility(g_Config.bShowTouchCircle);
|
|
actionButtons->setCrossVisibility(g_Config.bShowTouchCross);
|
|
actionButtons->setTriangleVisibility(g_Config.bShowTouchTriangle);
|
|
actionButtons->setSquareVisibility(g_Config.bShowTouchSquare);
|
|
|
|
controls_.push_back(actionButtons);
|
|
|
|
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");
|
|
|
|
const ImageID comboKeyImages[5] = { ImageID("I_1"), ImageID("I_2"), ImageID("I_3"), ImageID("I_4"), ImageID("I_5") };
|
|
|
|
if (g_Config.touchDpad.show) {
|
|
controls_.push_back(new PSPDPadButtons(g_Config.touchDpad, g_Config.fDpadSpacing));
|
|
}
|
|
|
|
if (g_Config.touchSelectKey.show) {
|
|
controls_.push_back(new DragDropButton(g_Config.touchSelectKey, rectImage, ImageID("I_SELECT")));
|
|
}
|
|
|
|
if (g_Config.touchStartKey.show) {
|
|
controls_.push_back(new DragDropButton(g_Config.touchStartKey, rectImage, ImageID("I_START")));
|
|
}
|
|
|
|
if (g_Config.touchUnthrottleKey.show) {
|
|
DragDropButton *unthrottle = new DragDropButton(g_Config.touchUnthrottleKey, rectImage, ImageID("I_ARROW"));
|
|
unthrottle->SetAngle(180.0f);
|
|
controls_.push_back(unthrottle);
|
|
}
|
|
|
|
if (g_Config.touchSpeed1Key.show) {
|
|
DragDropButton *speed1 = new DragDropButton(g_Config.touchSpeed1Key, rectImage, ImageID("I_ARROW"));
|
|
speed1->SetAngle(170.0f, 180.0f);
|
|
controls_.push_back(speed1);
|
|
}
|
|
|
|
if (g_Config.touchSpeed2Key.show) {
|
|
DragDropButton *speed2 = new DragDropButton(g_Config.touchSpeed2Key, rectImage, ImageID("I_ARROW"));
|
|
speed2->SetAngle(190.0f, 180.0f);
|
|
controls_.push_back(speed2);
|
|
}
|
|
|
|
if (g_Config.touchRapidFireKey.show) {
|
|
DragDropButton *rapidFire = new DragDropButton(g_Config.touchRapidFireKey, rectImage, ImageID("I_ARROW"));
|
|
rapidFire->SetAngle(90.0f, 180.0f);
|
|
controls_.push_back(rapidFire);
|
|
}
|
|
|
|
if (g_Config.touchLKey.show) {
|
|
controls_.push_back(new DragDropButton(g_Config.touchLKey, shoulderImage, ImageID("I_L")));
|
|
}
|
|
|
|
if (g_Config.touchRKey.show) {
|
|
DragDropButton *rbutton = new DragDropButton(g_Config.touchRKey, shoulderImage, ImageID("I_R"));
|
|
rbutton->FlipImageH(true);
|
|
controls_.push_back(rbutton);
|
|
}
|
|
|
|
if (g_Config.touchAnalogStick.show) {
|
|
controls_.push_back(new DragDropButton(g_Config.touchAnalogStick, stickBg, stickImage));
|
|
}
|
|
if (g_Config.touchRightAnalogStick.show) {
|
|
controls_.push_back(new DragDropButton(g_Config.touchRightAnalogStick, stickBg, stickImage));
|
|
}
|
|
if (g_Config.touchCombo0.show) {
|
|
controls_.push_back(new DragDropButton(g_Config.touchCombo0, roundImage, comboKeyImages[0]));
|
|
}
|
|
if (g_Config.touchCombo1.show) {
|
|
controls_.push_back(new DragDropButton(g_Config.touchCombo1, roundImage, comboKeyImages[1]));
|
|
}
|
|
if (g_Config.touchCombo2.show) {
|
|
controls_.push_back(new DragDropButton(g_Config.touchCombo2, roundImage, comboKeyImages[2]));
|
|
}
|
|
if (g_Config.touchCombo3.show) {
|
|
controls_.push_back(new DragDropButton(g_Config.touchCombo3, roundImage, comboKeyImages[3]));
|
|
}
|
|
if (g_Config.touchCombo4.show) {
|
|
controls_.push_back(new DragDropButton(g_Config.touchCombo4, roundImage, comboKeyImages[4]));
|
|
};
|
|
|
|
for (size_t i = 0; i < controls_.size(); i++) {
|
|
root_->Add(controls_[i]);
|
|
}
|
|
|
|
root_->Add(new SnapGrid(leftColumnWidth+10, bounds.w, 0, bounds.h, 0x3FFFFFFF));
|
|
}
|
|
|
|
// 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) {
|
|
return pickedControl_;
|
|
}
|
|
|
|
for (size_t i = 0; i < controls_.size(); i++) {
|
|
DragDropButton *control = controls_[i];
|
|
const Bounds &bounds = control->GetBounds();
|
|
const float thresholdFactor = 1.5f;
|
|
|
|
Bounds tolerantBounds(bounds.x, bounds.y, bounds.w * thresholdFactor, bounds.h * thresholdFactor);
|
|
if (tolerantBounds.Contains(x, y)) {
|
|
return control;
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|