win32: fixed restoring maximized window after switching from fullscreen

win32: holding Shift when resizing FCEUX window reverts "Force integral factors" meaning
win32: remodel "Video config" dialog:
* removed the list of predefined modes (they were broken anyway)
* removed FS stretching options (obsoleted by "Best Fit")
* removed broken display of "Current Pixel Aspect Ratio" (may return it after implementing the 4:3 mode)
* "Full Screen (hotkey: Alt + Enter or double-click)" - reads current hotkey mapping

[[Split portion of a mixed commit.]]
This commit is contained in:
ansstuff 2012-12-19 19:35:00 +00:00
parent 5df5312223
commit a8e244fd8f
2 changed files with 17 additions and 29 deletions

View File

@ -66,56 +66,44 @@
<p><span class="rvts41">Full Screen</span></p> <p><span class="rvts41">Full Screen</span></p>
<p>If checked, FCEUX will enter full screen mode when it is loaded.</p> <p>If checked, FCEUX will enter full screen mode when it is loaded.</p>
<p><br/></p> <p><br/></p>
<p><span class="rvts41">Enter Full Screen Mode after file is loaded</span></p> <p><span class="rvts41">Enter full screen mode after game is loaded</span></p>
<p>If checked, FCEUX will only enter full screen mode when a game is loaded.</p> <p>If checked, FCEUX will enter full screen mode when a game is loaded.</p>
<p><br/></p> <p><br/></p>
<p><span class="rvts41">Hide mouse cursor</span></p> <p><span class="rvts41">Hide mouse cursor</span></p>
<p>If checked, FCEUX will hide mouse cursor when entering full screen mode.</p> <p>If checked, FCEUX will hide mouse cursor when in full screen mode.</p>
<p><br/></p>
<p><span class="rvts41">Video Mode</span></p>
<p>Sets the image size while in full mode. If custom is selected, FCEUX will use the settings under "Custom Video Mode".</p>
<p><br/></p>
<p><span class="rvts41">Sync Method</span></p>
<p>If the emulator is running poorly, trying out these sync options can help make it run smoother.</p>
<p><br/></p>
<p><span class="rvts10">Disable Hardware Acceleration</span></p>
<p>If full screen is causing problems, checking this might fix it.</p>
<p><br/></p>
<p><span class="rvts28">Custom Video Mode</span></p>
<p><br/></p> <p><br/></p>
<p><span class="rvts41">Mode</span></p> <p><span class="rvts41">Mode</span></p>
<p>Sets the image size during full screen mode, if Custom is selected under Full Screen Settings. By default this is automatically set to math current display resolution.</p> <p>Sets the image size during full screen mode. By default this is automatically set to match current display resolution. You can change the resolution by entering different values.</p>
<p><br/></p>
<p><span class="rvts16">Image Size Transform</span></p>
<p><br/></p> <p><br/></p>
<p><span class="rvts41">Special Scaler</span></p> <p><span class="rvts41">Special Scaler</span></p>
<p>Within this box is four options: Hq2x, Scale2x, Hq3x, and Scale3x. </p> <p>Within this box is four options: Hq2x, Scale2x, Hq3x, and Scale3x. </p>
<p>- Scale2x/3x just attempts to render out the corners of the pixels to make them look a bit rounder. "2x" means two times bigger than 1x1 and "3x" means three times bigger than 1x1.</p> <p>- Scale2x/3x just attempts to render out the corners of the pixels to make them look a bit rounder. "2x" means two times bigger than 1x1 and "3x" means three times bigger than 1x1.</p>
<p>- Hq2x/3x does a much better job than scale2x/3x by smearing the pixels together with a slight blur. However, Hq2x/3x requires a faster computer for decent speed (at least 1 GHz and above). "2x" means two times bigger than 1x1 and "3x" means three times bigger than 1x1.</p> <p>- Hq2x/3x does a much better job than scale2x/3x by smearing the pixels together with a slight blur. However, Hq2x/3x requires a faster computer for decent speed (at least 1 GHz and above). "2x" means two times bigger than 1x1 and "3x" means three times bigger than 1x1.</p>
<p><br/></p> <p><br/></p>
<p><span class="rvts41">Stretch to Fill Screen</span></p> <p><span class="rvts41">Sync Method</span></p>
<p>Stretches the image to fill the screen during full screen mode.</p> <p>If the emulator is running poorly, trying out these sync options can help make it run smoother (fix image tearing).</p>
<p><br/></p> <p><br/></p>
<p><span class="rvts41">Scale Dimensions by:</span></p> <p><span class="rvts41">Disable Hardware Acceleration</span></p>
<p>Takes the image size and multiplies the X and Y by a specific amount.</p> <p>If full screen is causing problems, checking this might fix it.</p>
<p><br/></p> <p><br/></p>
<p><br/></p> <p><br/></p>
<p><span class="rvts12">Windowed Settings</span></p> <p><span class="rvts12">Windowed Settings</span></p>
<p><br/></p> <p><br/></p>
<p><span class="rvts41">Size Multiplier</span></p> <p><span class="rvts41">Size Multiplier</span></p>
<p>Takes the image size and multiples the X and Y by a specific amount. You can also change these by clicking and dragging the FCEUX window.</p> <p>Takes the image size and multiples the X and Y by a specific amount. You can also change these by clicking and dragging the border of the FCEUX window.</p>
<p><br/></p> <p><br/></p>
<p><span class="rvts41">Force Integral Scaling Factors</span></p> <p><span class="rvts41">Force Integral Scaling Factors</span></p>
<p>If checked, &nbsp;FCEUX can only be stretched by even amounts (1x, 2x, 3x, etc.). &nbsp;If unchecked, it can be stretched by any amount.</p> <p>If checked, &nbsp;FCEUX can only be stretched by even amounts (1x, 2x, 3x, etc.). &nbsp;If unchecked, it can be stretched by any amount.</p>
<p>When you are resizing FCEUX window by dragging its borders, you can hold Shift to temporarily revert this option.</p>
<p><br/></p> <p><br/></p>
<p><span class="rvts41">Force Aspect Ratio Correction</span></p> <p><span class="rvts41">Force Aspect Ratio Correction</span></p>
<p>Checking this will only allow the correct aspect ratio while stretching the window.</p> <p>Checking this will only allow the correct aspect ratio while resizing the window.</p>
<p><br/></p> <p><br/></p>
<p><span class="rvts41">Current Pixel Aspect Ratio</span></p> <p><span class="rvts41">Special Scaler</span></p>
<p>Displays the current Aspect Ratio</p> <p>Within this box is four options: Hq2x, Scale2x, Hq3x, and Scale3x. </p>
<p><br/></p> <p><br/></p>
<p><span class="rvts41">Sync Method</span></p> <p><span class="rvts41">Sync Method</span></p>
<p>If the emulator is running poorly, trying out these sync options can help make it run smoother.</p> <p>If the emulator is running poorly, trying out these sync options can help make it run smoother (fix image tearing).</p>
<p><br/></p> <p><br/></p>
<p><span class="rvts41">Disable Hardware Acceleration</span></p> <p><span class="rvts41">Disable Hardware Acceleration</span></p>
<p>This is checked by default. Slower computers may experience slow emulation and should uncheck this option. The video will be blurred somewhat with this option checked.</p> <p>This is checked by default. Slower computers may experience slow emulation and should uncheck this option. The video will be blurred somewhat with this option checked.</p>
@ -138,13 +126,13 @@
<p><span class="rvts41">Last Line</span></p> <p><span class="rvts41">Last Line</span></p>
<p>Sets the last scan line for NTSC and PAL Modes. This should be left on the default of 231 for NTSC and 239 for PAL.</p> <p>Sets the last scan line for NTSC and PAL Modes. This should be left on the default of 231 for NTSC and 239 for PAL.</p>
<p><br/></p> <p><br/></p>
<p><span class="rvts41">Clip Left and Right Sides</span><span class="rvts33"> (8 columns each)</span></p> <p><span class="rvts41">Clip left and right sides</span><span class="rvts33"> (8 px on each)</span></p>
<p>If enabled, 8 pixels from each side of the windows will be removed. Some NES games (even on real hardware) show grapical artifacts on the sides of screen when scrolling, so you may hide those artifacts by checking the option.</p> <p>If enabled, 8 pixels from each side of the windows will be removed. Some NES games (even on real hardware) show grapical artifacts on the sides of screen when scrolling, so you may hide those artifacts by checking the option.</p>
<p><br/></p> <p><br/></p>
<p><br/></p> <p><br/></p>
<p><span class="rvts28">Emulation</span></p> <p><span class="rvts28">Emulation</span></p>
<p><br/></p> <p><br/></p>
<p><span class="rvts10">Allow More than 8 sprites per scanline.</span></p> <p><span class="rvts41">Allow more than 8 sprites per scanline</span></p>
<p>On real NES hardware, more than 8 sprites on the screen causes flickering. &nbsp;Enabling this can cause less flickering by allowing more sprites to be visible at once. &nbsp;If you prefer to stay "true" to NES hardware, this should not be checked.</p> <p>On real NES hardware, more than 8 sprites on the screen causes flickering. &nbsp;Enabling this can cause less flickering by allowing more sprites to be visible at once. &nbsp;If you prefer to stay "true" to NES hardware, this should not be checked.</p>
<p><br/></p> <p><br/></p>
<p><br/></p> <p><br/></p>

File diff suppressed because one or more lines are too long