diff --git a/Changes.txt b/Changes.txt index a6b34ae41..1f5156f84 100644 --- a/Changes.txt +++ b/Changes.txt @@ -24,6 +24,8 @@ * Added 2nd UI theme and hotkey for toggling UI theme. + * Adde bezel support. + * Added optional type format detection based on colors used. * Added Joy2B+ controller support. diff --git a/docs/graphics/options_audio.png b/docs/graphics/options_audio.png index b84e87e5c..5583c3060 100644 Binary files a/docs/graphics/options_audio.png and b/docs/graphics/options_audio.png differ diff --git a/docs/graphics/options_bezels.png b/docs/graphics/options_bezels.png new file mode 100644 index 000000000..eca14cff1 Binary files /dev/null and b/docs/graphics/options_bezels.png differ diff --git a/docs/graphics/options_video.png b/docs/graphics/options_video.png index 232583505..6832c5e41 100644 Binary files a/docs/graphics/options_video.png and b/docs/graphics/options_video.png differ diff --git a/docs/graphics/options_video_palettes.png b/docs/graphics/options_video_palettes.png index 9c231eb92..a059361d0 100644 Binary files a/docs/graphics/options_video_palettes.png and b/docs/graphics/options_video_palettes.png differ diff --git a/docs/graphics/options_video_tv.png b/docs/graphics/options_video_tv.png index 062db25da..4cdb07c82 100644 Binary files a/docs/graphics/options_video_tv.png and b/docs/graphics/options_video_tv.png differ diff --git a/docs/index.html b/docs/index.html index 30013da88..7f86940c6 100644 --- a/docs/index.html +++ b/docs/index.html @@ -313,6 +313,7 @@
  • Tracking of user favorites and popular or recently played ROMs.
  • High scores saving (internal or via PlusROM High Score Club)
  • Cross-platform UI including a built-in ROM launcher frontend
  • +
  • Supports bezel display
  • Built-in extensive debugger, including static analysis with the Distella disassembler and dynamic analysis at runtime by tracking code/graphics/data sections, and generation of DASM-compatible disassembly files
  • @@ -1178,8 +1179,8 @@ Toggle aspect ratio correct scaling - Control + C - Control + C + Shift-Control + C + Shift-Control + C Decrease vertical display size @@ -2688,6 +2689,15 @@ Enable or disable emulation dimming in pause mode. + +
    -showbezel <1|0>
    + Enable or disable bezel display. + + +
    -bezeldir <path>
    + Specifies from where bezel images are loaded.. + +
    -audio.enabled <1|0>
    Enable or disable sound generation. @@ -3750,6 +3760,23 @@
    +

    Video & Audio Settings dialog (Bezels):

    + + + + + + +
         + + + + +
    ItemBrief descriptionFor more information,
    see Command Line
    Enable bezelsEnables the bezel display if a ROM name matching bezel image or a + default image (named 'default.png') can be found using the bezel path.-showbezel
    Bezel pathSpecifies the path from where bezel images are loaded.-bezeldir
    +
    +
    +

    Video & Audio Settings dialog (Audio):

    diff --git a/src/emucore/FrameBuffer.cxx b/src/emucore/FrameBuffer.cxx index c8f2734b7..6974b876c 100644 --- a/src/emucore/FrameBuffer.cxx +++ b/src/emucore/FrameBuffer.cxx @@ -1388,6 +1388,7 @@ bool FrameBuffer::loadBezel() (myActiveVidMode.screenS.h - bezelH) / 2); // center myBezelSurface->setScalingInterpolation(ScalingInterpolation::sharp); + // Enable blending to allow overlaying the bezel over the TIA output myBezelSurface->attributes().blending = true; myBezelSurface->attributes().blendalpha = 100; myBezelSurface->applyAttributes(); diff --git a/src/gui/DialogContainer.cxx b/src/gui/DialogContainer.cxx index 293257d8b..f3d63c227 100644 --- a/src/gui/DialogContainer.cxx +++ b/src/gui/DialogContainer.cxx @@ -269,7 +269,7 @@ void DialogContainer::handleMouseButtonEvent(MouseButton b, bool pressed, if(b == MouseButton::MIDDLE) { - // Middle mouse button emulates lef mouse button double click + // Middle mouse button emulates left mouse button double click myLastClick.count = 2; b = MouseButton::LEFT; }