Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

wxWidgets 3.0 fixes #741

Merged
merged 5 commits into from
Aug 5, 2015
Merged

wxWidgets 3.0 fixes #741

merged 5 commits into from
Aug 5, 2015

Conversation

turtleli
Copy link
Member

@turtleli turtleli commented Aug 5, 2015

Regressions fixed:

  • EE and VU Slider click handling - pcsx2 uses a custom event handler to handle click events, and then passes the event to the default wxWidgets click handler. So click events are processed twice. Remove the custom event handler - it's designed for Windows yet only breaks Windows.
  • GSPanel colour - Now it's black instead of the default grey.
  • wxCore30 rcdefs.h location - wxCore30 continually reports that it's out of date because it can't find rcdefs.h. The pathname is now fixed for the VS2013 file.

Regressions partially fixed:

  • Screenshot function - The default alpha channel settings of wx3.0 on Windows seem different from wx2.8. For now I've removed the alpha channel information from the image on Windows which degrades the screenshots slightly. The proper fix should be to set the transparency of all the UI elements correctly, but that'll probably take quite a while to do correctly.

Other fixes:

  • Speedhacks description - The "Other Hacks" and "microVU Hacks" checkbox descriptions are truncated. This problem actually existed on Windows wx2.8 as well, but was less obvious. Use sizer flags so that the checkbox descriptions are shown in full. (Or should be, only tested a few languages)

Tested on Windows VS2013, Linux wx2.8/wx3.0.

Question: Why does the EE slider start from 1 and the VU slider start from 0? It makes no sense to me.

The custom scroll event handler increments/decrements the slider value
by one when a click event is detected. It also propagates the event to
the wxWidgets3.0 built in slider scroll event handler, which repeats the
same action. This causes the slider to add/subtract 2 whenever it is
clicked on Windows.

Remove the custom function.
The "Other Hacks" and "microVU Hacks" checkbox descriptions are
truncated in both Windows and Linux. Use sizer flags so the descriptions
show up properly.
Visual Studio flags wxCore30 as being out of date because it can't find
the rcdefs.h header file. Use the arch dependent pathname so it is
located correctly.
People prefer it that way and it's an easy enough fix.
wxWidgets 3.0 seems to have a different default device context alpha
channel handling on Windows, which makes the screenshot function
unusable.

As a incomplete fix, remove the alpha channel information from the final
image on Windows. Screenshots degrade slightly.
@turtleli turtleli changed the title wxWindows 3.0 fixes wxWidgets 3.0 fixes Aug 5, 2015
avih added a commit that referenced this pull request Aug 5, 2015
@avih avih merged commit 68a89bb into PCSX2:master Aug 5, 2015
@avih
Copy link
Contributor

avih commented Aug 5, 2015

Thanks. I was just about to commit a patch which restores rcdefs.h to the location where it searches for it (and which is part of the wx distribution and the PCSX2 repo but got removed at 24d5e59), but you sent the PR 2s before I pushed, so you win ;)

@turtleli
Copy link
Member Author

turtleli commented Aug 5, 2015

Well, that was my fault. I seem to suck at the whole build system business. :(

@avih
Copy link
Contributor

avih commented Aug 5, 2015

You seem to be doing better than most ;) Thanks again!

@turtleli turtleli deleted the wx3-regression-fixes branch August 5, 2015 23:10
@bositman
Copy link
Member

bositman commented Aug 6, 2015

The EE slider starts from 1 because we run the EE by default lower than on the PS2, with no compatibility hit, IIRC.

@turtleli
Copy link
Member Author

turtleli commented Aug 6, 2015

Ok, turns out I should read the text description more closely. Cyclerate of 0 would probably confuse people ;)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants