Move "Display Rotation" and stretching options to display layout editor. #8182

LunaMoo · 2015-11-07T00:23:58Z

Seems fitting since it's not really a performance setting where it is now, also makes one option less in graphics setting menu.
Also fix portrait rotation representation in the editor with auto setting and minor cleanup.

Edit: this kind of goes along the recent cleaning spirit:P, but if the main change is not ok let me know so I can revert it and just leave the minor fix and cleaning.

daniel229 · 2015-11-07T02:33:46Z

Can you add "Display Rotation" to the windows menu bar under the "Emulation".

LunaMoo · 2015-11-07T03:20:03Z

Ok, not sure if that's the right place, but I guess it can be treated same as umd switch also something we can't physicaly do(well rotating TV for example;p).

CarlKenner · 2015-11-07T03:43:34Z

Sounds like a bad idea to me. It's not really a performance setting, but it is really a game specific graphics hack.

daniel229 · 2015-11-07T04:00:06Z

@LunaMoo Thanks.

LunaMoo · 2015-11-07T04:09:07Z

@CarlKenner it's not really a graphics hack since it doesn't affect game rendering, it's more of a feature that on desktop can't be physically done, so just like UMD switch which already is under emulation settings it seems to fit there. Either way that was only about creating new option in windows menu bar and that's divided differently from main menus on simply emulation, debug and game settings.

Being or not being performance settings I mentioned in context of where the option is placed now in ppsspp GUI, since along #8171 we want to clear as much clutter as we can from the main menus and graphics setting is really tragic with that. The display layout editor screen seems much better place for it since it's already centered around moving and resizing display. It will still be in the graphics section, just one screen deeper.

@daniel229 you're welcome, through it will not depend on me if that get's there or not;3.

hrydgard · 2015-11-12T18:33:11Z

This has some odd issues:

The rotation picker drifts upwards and disappears of the screen as you resize the window
The screen overlaps the blue borders when switching to landscape

(oops, semitranslated Swedish, heh)

A little bit more polish and I'll merge, it's pretty neat :)

LunaMoo · 2015-11-13T07:58:36Z

Thanks for finding that out, appears touch control layout screen was affected by that as well so I fixed both.
Also added some other cases to display representation on auto to match functionality in cases other than common widescreen resolution since that was also missing.

Edit: pushed it again since I forgot to remove one unnecessary variable;3

LunaMoo · 2015-11-13T08:53:22Z

@hrydgard what do you think about also moving "Stretch to display" checkbox inside display layout editor screen? I could change it to be always accessible, just disable zoom options when stretched instead. I don't think that option is often used either and also fits meaning another -1 to graphics settings screen.

hrydgard · 2015-11-13T09:32:01Z

Yeah, that would be great.

LunaMoo · 2015-11-13T21:36:54Z

Instead of separate option, I renamed zoom settings to more general "Options"(and reused translation for it from cheat menu) and included both stretching options there. They can't be enabled with other options anyway, so might as well be one.
Also when stretching is used it'll replace the screen representation to reflect that.

unknownbrackets · 2015-12-19T21:50:04Z

Windows/MainWindow.cpp

@@ -281,6 +283,10 @@ namespace MainWindow
 			NativeMessageReceived("gpu resized", "");
 		}

+		if (screenManager) {
+			screenManager->RecreateAllViews();


Is this the correct thread to do this from? Shouldn't this happen via an event?

-[Unknown]

Well that's a fix for the issue which messes up both this and touch control layout screens since they aren't recreated whenever you resize window as on Henrik's screenshot above. Not really sure how to deal with it differently.

Hmm. Maybe we should recreate views when the resized event comes through to the DisplayLayoutEditor? I mean via void DisplayLayoutScreen::sendMessage(const char *message, const char *value) {.

-[Unknown]

LunaMoo · 2015-12-21T06:05:06Z

Changes:
Re-added blackberry partial stretch check that was setting default, but since it really only checks for resolution proportions, I made it for all devices.
Divided zoom type from level also limited all display representation scaling(*/ 8) to display layout screen and added an extra slider to set zoom level accurately aside to mouse/touch resize.
Got rid of the lenghty and potentially confusing submenu and replaced it with direct link to the screen.

Pretty much that's how it looks now:

Extra options are hidden when stretching or automatic scaling is used, also rotation is grayed out and visual representation looses potential rotation when non-buffered rendering is being used.

unknownbrackets · 2015-12-21T06:12:49Z

I use a 4:3 screen and would not want partial stretch on my desktop. I would prefer the black bars. I'm not sure making it the default for everyone makes sense, it makes more sense for small screens.

-[Unknown]

LunaMoo · 2015-12-21T06:34:43Z

Ok then, changed it your way. Althrough imo the same way someone could not like it on smaller device as well since it's a matter of proportions not size really, just like emulating older consoles on psp, small wide screen, but it's not like everyone stretched old games just to get a bit less black bars.
Either way it's just defaults anyway so anyone wanting to change it will be able.

unknownbrackets · 2016-01-17T07:40:22Z

Hey, it's been a while, I think some change has conflicted. Pretty sure it's my fault - I changed this line if (g_Config.iGPUBackend == GPU_BACKEND_OPENGL) { offsetY = offsetY * -1.0f; } to fix a backend thing.

Could you rebase? I haven't looked carefully at all the UI code, but it looks like this is ready to go, right?

-[Unknown]

Fix portrait rotation representation in the editor with auto setting. Minor cleanup.

… on window resize(this also fixes touch control layout screen).

LunaMoo · 2016-01-17T09:02:46Z

Sorry kind of forgot about it, but yeah should be ready / rebased.

unknownbrackets · 2016-01-17T10:03:51Z

Qt/mainwindow.cpp

-		->addEventChecked(&g_Config.bStretchToDisplay);
+	MenuTree* displayLayoutMenu = new MenuTree(this, videoMenu, QT_TR_NOOP("&Display Layout Options"));
+	displayLayoutGroup = new MenuActionGroup(this, displayLayoutMenu, SLOT(displayLayoutGroup_triggered(QAction *)),
+		QStringList() << "Stretched" << "Partialy stretched" << "Auto Scaling" << "Manual Scaling",


*Partially.... does this get translated?

-[Unknown]

LunaMoo · 2016-01-17T10:59:58Z

Fixed all of that not counting Qt, no clue what to do with it, I recall I initially just fixed the build trying to maintain existing functionality, but I had to do it blindly, I don't even know how Qt menu looks(well I imagine it is a drop down menu, but that's it), looking at other options as I based that code on existing stuff I saw there it doesn't seem to have translations.(?)
Also would be best to just link it to display layout editor menu like on windows, but I don't know if it's even possible for it.

//Edit: oh and the land of spaces had suprising amount of aliens;p.

unknownbrackets · 2016-01-17T18:52:32Z

//Edit: oh and the land of spaces had suprising amount of aliens;p.

Hahahaha... sorry. Thanks.

In the interface, "Stretching" and "Auto Scaling" look different, and "Stretching" reacts to clicks but doesn't do anything. Is that intentional?

Also, I think it's an improvement as is, but if you click not in the center, and then move, the frame jumps to center on your cursor. Usually I prefer to save the initial click offset somewhere, and apply that every time so that the drag is fluid.

It'd be cool if you could focus that particular view, and press X, and then use the arrow keys to move it, and then press X again or O to release.

Anyway, those don't seem necessary. LGTM, what do you think @hrydgard?

-[Unknown]

LunaMoo · 2016-01-17T21:14:44Z

Don't know about controls, but the moving part was easy and seems nice change, thanks for that idea.

Also minor changes - displayed zoom value should now update instantly when resizing and disabled that click you catched as that "choice" is there just a visualization.

unknownbrackets · 2016-01-17T21:27:57Z

UI/DisplayLayoutScreen.cpp

 	if ((touch.flags & TOUCH_MOVE) && picked_ != 0) {
+		int touchX = touch.x - offsetTouchX;
+		int touchY = touch.y - offsetTouchY;
 		if (mode == 0) {
 			const Bounds &bounds = picked_->GetBounds();

 			int mintouchX = screen_bounds.w / 4;


Oh, sorry for the nitpick - minTouchX right?

-[Unknown]

Nah minTouchX is not offset it sets bounds of the movement on the screen, I reused it in maxTouchX because it was same equation, ~ simplified, but that's not offset:).

I just meant touch vs Touch, your change is good I'm just being the camel case police, sorry.

-[Unknown]

Aaahh I see now, I looked at the changed code instead of the line you mentioned ~ attention colors heh;p. Will rename that.

unknownbrackets · 2016-01-17T21:28:47Z

Nice.

-[Unknown]

LunaMoo · 2016-01-17T21:36:50Z

Pushed it again with a fix for resize I updated incorrectly(could get to 0;p), either way moving and resizing does work much smoother with the offset now.

hrydgard · 2016-01-17T21:42:15Z

Alright, let's merge when the buildbot is happy :)

Move "Display Rotation" and stretching options to display layout editor.

LunaMoo force-pushed the minor_cleaning branch from 23a0378 to fb63741 Compare November 13, 2015 07:51

LunaMoo force-pushed the minor_cleaning branch from fb63741 to 323e46a Compare November 13, 2015 08:12

LunaMoo changed the title ~~Move "Display Rotation" to display layout editor.~~ Move "Display Rotation" and stretching options to display layout editor. Nov 14, 2015

unknownbrackets reviewed Dec 19, 2015
View reviewed changes

LunaMoo force-pushed the minor_cleaning branch from 0b7f2b4 to ca2a09d Compare December 21, 2015 05:42

LunaMoo added 6 commits January 17, 2016 09:18

Move "Display Rotation" to display layout editor.

284600b

Fix portrait rotation representation in the editor with auto setting. Minor cleanup.

Add Display Rotation to windows menu bar.

57c193d

Make sure display representation matches all cases and recreate views…

0c2efa6

… on window resize(this also fixes touch control layout screen).

Integrate stretching options into display layout editor.

e4271fe

Some improvements, comments and polishing.

6061ad7

Set default partial stretch only for blackberry devices without ws.

55903ce

LunaMoo force-pushed the minor_cleaning branch from 18e7c8e to 55903ce Compare January 17, 2016 08:30

unknownbrackets reviewed Jan 17, 2016
View reviewed changes

Tabs can't live in space and some other corrections.

80fa269

LunaMoo force-pushed the minor_cleaning branch from 42b738a to 80fa269 Compare January 17, 2016 11:14

unknownbrackets reviewed Jan 17, 2016
View reviewed changes

Smooth out touch moving and resize and other small changes.

6751617

LunaMoo force-pushed the minor_cleaning branch from a8885c1 to 6751617 Compare January 17, 2016 21:32

Rename variable to match others.

f54e9d8

unknownbrackets added a commit that referenced this pull request Jan 17, 2016

Merge pull request #8182 from LunaMoo/minor_cleaning

5161476

Move "Display Rotation" and stretching options to display layout editor.

unknownbrackets merged commit 5161476 into hrydgard:master Jan 17, 2016

LunaMoo deleted the minor_cleaning branch January 24, 2016 05:21

vnctdj mentioned this pull request Jan 30, 2016

Broken translation in [DesktopUI] #8529

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Move "Display Rotation" and stretching options to display layout editor. #8182

Move "Display Rotation" and stretching options to display layout editor. #8182

LunaMoo commented Nov 7, 2015

daniel229 commented Nov 7, 2015

LunaMoo commented Nov 7, 2015

CarlKenner commented Nov 7, 2015

daniel229 commented Nov 7, 2015

LunaMoo commented Nov 7, 2015

hrydgard commented Nov 12, 2015

LunaMoo commented Nov 13, 2015

LunaMoo commented Nov 13, 2015

hrydgard commented Nov 13, 2015

LunaMoo commented Nov 13, 2015

unknownbrackets Dec 19, 2015

LunaMoo Dec 20, 2015

unknownbrackets Jan 17, 2016

LunaMoo commented Dec 21, 2015

unknownbrackets commented Dec 21, 2015

LunaMoo commented Dec 21, 2015

unknownbrackets commented Jan 17, 2016

LunaMoo commented Jan 17, 2016

unknownbrackets Jan 17, 2016

LunaMoo commented Jan 17, 2016

unknownbrackets commented Jan 17, 2016

LunaMoo commented Jan 17, 2016

unknownbrackets Jan 17, 2016

LunaMoo Jan 17, 2016

unknownbrackets Jan 17, 2016

LunaMoo Jan 17, 2016

unknownbrackets commented Jan 17, 2016

LunaMoo commented Jan 17, 2016

hrydgard commented Jan 17, 2016

Move "Display Rotation" and stretching options to display layout editor. #8182

Move "Display Rotation" and stretching options to display layout editor. #8182

Conversation

LunaMoo commented Nov 7, 2015

daniel229 commented Nov 7, 2015

LunaMoo commented Nov 7, 2015

CarlKenner commented Nov 7, 2015

daniel229 commented Nov 7, 2015

LunaMoo commented Nov 7, 2015

hrydgard commented Nov 12, 2015

LunaMoo commented Nov 13, 2015

LunaMoo commented Nov 13, 2015

hrydgard commented Nov 13, 2015

LunaMoo commented Nov 13, 2015

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

LunaMoo commented Dec 21, 2015

unknownbrackets commented Dec 21, 2015

LunaMoo commented Dec 21, 2015

unknownbrackets commented Jan 17, 2016

LunaMoo commented Jan 17, 2016

Choose a reason for hiding this comment

LunaMoo commented Jan 17, 2016

unknownbrackets commented Jan 17, 2016

LunaMoo commented Jan 17, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

unknownbrackets commented Jan 17, 2016

LunaMoo commented Jan 17, 2016

hrydgard commented Jan 17, 2016