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

UI: Prevent drag drift in layout editor.

Browse Source 
Fixes #12797.
This commit is contained in:
Unknown W. Brackets 2020-04-05 11:56:07 -07:00
parent 44e2849105
commit 801617bfc6
1 changed files with 23 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
UI/DisplayLayoutScreen.cpp
View File

@ -35,10 +35,6 @@
static const int leftColumnWidth = 200; static const int leftColumnWidth = 200;
static const float orgRatio = 1.764706f; static const float orgRatio = 1.764706f;
// Ugly hackery, need to rework some stuff to get around this
static float local_dp_xres;
static float local_dp_yres;
static float ScaleSettingToUI() { static float ScaleSettingToUI() {
float scale = g_Config.fSmallDisplayZoomLevel * 8.0f; float scale = g_Config.fSmallDisplayZoomLevel * 8.0f;
// Account for 1x display doubling dps. // Account for 1x display doubling dps.
@ -62,33 +58,32 @@ static void UpdateScaleSettingFromUI(float scale) {
class DragDropDisplay : public MultiTouchDisplay { class DragDropDisplay : public MultiTouchDisplay {
public: public:
DragDropDisplay(float &x, float &y, ImageID img, float &scale) DragDropDisplay(float &x, float &y, ImageID img, float &scale, const Bounds &screenBounds)
: MultiTouchDisplay(img, scale, new UI::AnchorLayoutParams(x * local_dp_xres, y * local_dp_yres, UI::NONE, UI::NONE, true)), : MultiTouchDisplay(img, scale, new UI::AnchorLayoutParams(x * screenBounds.w, y * screenBounds.h, UI::NONE, UI::NONE, true)),
x_(x), y_(y), theScale_(scale) { x_(x), y_(y), theScale_(scale), screenBounds_(screenBounds) {
scale_ = theScale_; scale_ = theScale_;
} }
virtual void SaveDisplayPosition() { virtual void SaveDisplayPosition() {
x_ = bounds_.centerX() / local_dp_xres; x_ = bounds_.centerX() / screenBounds_.w;
y_ = bounds_.centerY() / local_dp_yres; y_ = bounds_.centerY() / screenBounds_.h;
scale_ = theScale_; scale_ = theScale_;
} }
virtual float GetScale() const { return theScale_; } virtual float GetScale() const { return theScale_; }
virtual void SetScale(float s) { theScale_ = s; scale_ = s; } virtual void SetScale(float s) { theScale_ = s; scale_ = s; }
private: private:
float &x_, &y_; float &x_, &y_;
float &theScale_; float &theScale_;
const Bounds &screenBounds_;
}; };
DisplayLayoutScreen::DisplayLayoutScreen() { DisplayLayoutScreen::DisplayLayoutScreen() {
picked_ = 0; picked_ = nullptr;
mode_ = nullptr; mode_ = nullptr;
}; };
bool DisplayLayoutScreen::touch(const TouchInput &touch) { bool DisplayLayoutScreen::touch(const TouchInput &touch) {
UIScreen::touch(touch); UIScreen::touch(touch);
@ -100,17 +95,18 @@ bool DisplayLayoutScreen::touch(const TouchInput &touch) {
} }
const Bounds &screen_bounds = screenManager()->getUIContext()->GetBounds(); const Bounds &screen_bounds = screenManager()->getUIContext()->GetBounds();
if ((touch.flags & TOUCH_MOVE) && picked_ != 0) { if ((touch.flags & TOUCH_MOVE) && picked_ != nullptr) {
int touchX = touch.x - offsetTouchX; int touchX = touch.x - offsetTouchX;
int touchY = touch.y - offsetTouchY; int touchY = touch.y - offsetTouchY;
if (mode == 0) { if (mode == 0) {
const Bounds &bounds = picked_->GetBounds(); const auto &prevParams = picked_->GetLayoutParams()->As<AnchorLayoutParams>();
Point newPos(prevParams->left, prevParams->top);
int limitX = g_Config.fSmallDisplayZoomLevel * 120; int limitX = g_Config.fSmallDisplayZoomLevel * 120;
int limitY = g_Config.fSmallDisplayZoomLevel * 68; int limitY = g_Config.fSmallDisplayZoomLevel * 68;
const int quarterResX = local_dp_xres / 4; const int quarterResX = screen_bounds.w / 4;
const int quarterResY = local_dp_yres / 4; const int quarterResY = screen_bounds.h / 4;
if (bRotated) { if (bRotated) {
//swap X/Y limit for rotated display //swap X/Y limit for rotated display
@ -131,10 +127,10 @@ bool DisplayLayoutScreen::touch(const TouchInput &touch) {
if (touchY > windowUpperEdge - 8 + limitY && touchY < windowUpperEdge + 8 + limitY) { touchY = windowUpperEdge + limitY; stickToEdgeY = true; } if (touchY > windowUpperEdge - 8 + limitY && touchY < windowUpperEdge + 8 + limitY) { touchY = windowUpperEdge + limitY; stickToEdgeY = true; }
if (touchY > windowLowerEdge - 8 - limitY && touchY < windowLowerEdge + 8 - limitY) { touchY = windowLowerEdge - limitY; stickToEdgeY = true; } if (touchY > windowLowerEdge - 8 - limitY && touchY < windowLowerEdge + 8 - limitY) { touchY = windowLowerEdge - limitY; stickToEdgeY = true; }
const int minX = local_dp_xres / 2; const int minX = screen_bounds.w / 2;
const int maxX = local_dp_xres + minX; const int maxX = screen_bounds.w + minX;
const int minY = local_dp_yres / 2; const int minY = screen_bounds.h / 2;
const int maxY = local_dp_yres + minY; const int maxY = screen_bounds.h + minY;
// Display visualization disappear outside of those bounds, so we have to limit // Display visualization disappear outside of those bounds, so we have to limit
if (touchX < -minX) touchX = -minX; if (touchX < -minX) touchX = -minX;
if (touchX > maxX) touchX = maxX; if (touchX > maxX) touchX = maxX;
@ -145,15 +141,14 @@ bool DisplayLayoutScreen::touch(const TouchInput &touch) {
if (quarterResX > limitX) limitX = quarterResX; if (quarterResX > limitX) limitX = quarterResX;
if (quarterResY > limitY) limitY = quarterResY; if (quarterResY > limitY) limitY = quarterResY;
int newX = bounds.centerX(), newY = bounds.centerY();
// Allow moving zoomed in display freely as long as at least noticeable portion of the screen is occupied // Allow moving zoomed in display freely as long as at least noticeable portion of the screen is occupied
if (touchX > minX - limitX - 10 && touchX < minX + limitX + 10) { if (touchX > minX - limitX - 10 && touchX < minX + limitX + 10) {
newX = touchX; newPos.x = touchX;
} }
if (touchY > minY - limitY - 10 && touchY < minY + limitY + 10) { if (touchY > minY - limitY - 10 && touchY < minY + limitY + 10) {
newY = touchY; newPos.y = touchY;
} }
picked_->ReplaceLayoutParams(new UI::AnchorLayoutParams(newX, newY, NONE, NONE, true)); picked_->ReplaceLayoutParams(new AnchorLayoutParams(newPos.x, newPos.y, NONE, NONE, true));
} else if (mode == 1) { } else if (mode == 1) {
// Resize. Vertical = scaling, horizontal = spacing; // Resize. Vertical = scaling, horizontal = spacing;
// Up should be bigger so let's negate in that direction // Up should be bigger so let's negate in that direction
@ -183,11 +178,9 @@ bool DisplayLayoutScreen::touch(const TouchInput &touch) {
} }
if ((touch.flags & TOUCH_UP) && picked_ != 0) { if ((touch.flags & TOUCH_UP) && picked_ != 0) {
const Bounds &bounds = picked_->GetBounds(); const Bounds &bounds = picked_->GetBounds();
float saveX_ = touch.x;
float saveY_ = touch.y;
startScale_ = picked_->GetScale(); startScale_ = picked_->GetScale();
picked_->SaveDisplayPosition(); picked_->SaveDisplayPosition();
picked_ = 0; picked_ = nullptr;
} }
return true; return true;
} }
@ -250,9 +243,6 @@ public:
void DisplayLayoutScreen::CreateViews() { void DisplayLayoutScreen::CreateViews() {
const Bounds &bounds = screenManager()->getUIContext()->GetBounds(); const Bounds &bounds = screenManager()->getUIContext()->GetBounds();
local_dp_xres = bounds.w;
local_dp_yres = bounds.h;
using namespace UI; using namespace UI;
auto di = GetI18NCategory("Dialog"); auto di = GetI18NCategory("Dialog");
@ -334,11 +324,11 @@ void DisplayLayoutScreen::CreateViews() {
mode_->AddChoice(di->T("Resize")); mode_->AddChoice(di->T("Resize"));
mode_->SetSelection(0); mode_->SetSelection(0);
} }
displayRepresentation_ = new DragDropDisplay(g_Config.fSmallDisplayOffsetX, g_Config.fSmallDisplayOffsetY, ImageID("I_PSP_DISPLAY"), displayRepresentationScale_); displayRepresentation_ = new DragDropDisplay(g_Config.fSmallDisplayOffsetX, g_Config.fSmallDisplayOffsetY, ImageID("I_PSP_DISPLAY"), displayRepresentationScale_, bounds);
displayRepresentation_->SetVisibility(V_VISIBLE); displayRepresentation_->SetVisibility(V_VISIBLE);
} else { // Stretching } else { // Stretching
label = new HighlightLabel(gr->T("Stretching"), new AnchorLayoutParams(WRAP_CONTENT, 64.0f, bounds.w / 2.0f, bounds.h / 2.0f, NONE, NONE, true)); label = new HighlightLabel(gr->T("Stretching"), new AnchorLayoutParams(WRAP_CONTENT, 64.0f, bounds.w / 2.0f, bounds.h / 2.0f, NONE, NONE, true));
displayRepresentation_ = new DragDropDisplay(g_Config.fSmallDisplayOffsetX, g_Config.fSmallDisplayOffsetY, ImageID("I_PSP_DISPLAY"), displayRepresentationScale_); displayRepresentation_ = new DragDropDisplay(g_Config.fSmallDisplayOffsetX, g_Config.fSmallDisplayOffsetY, ImageID("I_PSP_DISPLAY"), displayRepresentationScale_, bounds);
displayRepresentation_->SetVisibility(V_INVISIBLE); displayRepresentation_->SetVisibility(V_INVISIBLE);
float width = previewWidth; float width = previewWidth;
float height = previewHeight; float height = previewHeight;