diff options
author | 2021-09-06 06:34:42 +1000 | |
---|---|---|
committer | 2021-09-06 06:34:42 +1000 | |
commit | 4f495994c41cd2fbaf89c08f755e828ae3261828 (patch) | |
tree | 8ea2c8522b807e394ea942460687b66e3ec7e381 /src/osd/osdcore.cpp | |
parent | 5e02ff231e2472e7e75a97b6e8758a070b227f8e (diff) |
-ui: Made zoom controls a bit more intuitive.
* The UI controls are described as zoom in/out, but they had the
opposite effect on the palette and tile viewers. That has been
changed to make them consistent with the tilemap viewer.
* Made the default zoom key not act as a toggle. People are familiar
with the function of Ctrl+0/=/- in web browsers, so making them behave
similarly in MAME should make it more approachable. Also added the
default zoom key to the relevant documentation page.
* Implemented the default zoom key for the palette and tile viewers.
* In the tilemap viewer, if the view is in default expand to fit mode,
zoom in/out starting from the actual zoom ratio. Once again, this
behaves more like the zoom controls in a web browser displaying an
image so it should be more intuitive.
* Made more messages from the tilemap viewer localisable.
-util/zippath.cpp: Fixed MT08074.
* There were multiple issues at play here. After #8443 was applied,
is_root was simply never returning true on Windows, as OSD_WINDOWS
isn't actually defined outside libosd and libocore. This caused
phantom parent items to appear in disk roots on Windows, but it meant
that the check in zippath_resolve would always fail so the trailing
backslash would be trimmed. Fixing the macro test in is_root meant
the trailing backslash from C:\ would no longer be trimmed, which
caused the stat in zippath_resolve to fail.
-bigbord2.cpp: Hooked up floppy DRQ that had somehow got lost.
-Reduced tag map lookups in several drivers and devices.
-util/coretmpl.h: Removed an overload of bitswap that can be avoided
using if constexpr.
-Added doxygen comments to some classes, and fixed several doxygen
warnings.
-util, osd: Test for _WIN32 rather than WIN32.
* In C++17 mode, WIN32 is no longer a predefined macro, although various
things in 3rdparty define it to maintain legacy support. We're better
off moving forward anyway for when WIN32 disappears entirely. (WIN32
is not a reserved name, while _WIN32 is, starting with an underscore
follwed by an uppercase letter.)
Diffstat (limited to 'src/osd/osdcore.cpp')
-rw-r--r-- | src/osd/osdcore.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/osd/osdcore.cpp b/src/osd/osdcore.cpp index f883e50f321..f5860416381 100644 --- a/src/osd/osdcore.cpp +++ b/src/osd/osdcore.cpp @@ -139,7 +139,7 @@ void osd_vprintf_debug(util::format_argument_pack<std::ostream> const &args) osd_ticks_t osd_ticks() { -#ifdef WIN32 +#ifdef _WIN32 LARGE_INTEGER val; QueryPerformanceCounter(&val); return val.QuadPart; @@ -155,7 +155,7 @@ osd_ticks_t osd_ticks() osd_ticks_t osd_ticks_per_second() { -#ifdef WIN32 +#ifdef _WIN32 LARGE_INTEGER val; QueryPerformanceFrequency(&val); return val.QuadPart; @@ -170,7 +170,7 @@ osd_ticks_t osd_ticks_per_second() void osd_sleep(osd_ticks_t duration) { -#ifdef WIN32 +#ifdef _WIN32 // sleep_for appears to oversleep on Windows with gcc 8 Sleep(duration / (osd_ticks_per_second() / 1000)); #else @@ -190,7 +190,7 @@ void osd_sleep(osd_ticks_t duration) std::vector<std::string> osd_get_command_line(int argc, char *argv[]) { std::vector<std::string> results; -#ifdef WIN32 +#ifdef _WIN32 { // Get the command line from Windows int count; @@ -206,7 +206,7 @@ std::vector<std::string> osd_get_command_line(int argc, char *argv[]) LocalFree(wide_args); } -#else // !WIN32 +#else // !_WIN32 { // for non Windows platforms, we are assuming that arguments are // already UTF-8; we just need to convert to std::vector<std::string> @@ -214,6 +214,6 @@ std::vector<std::string> osd_get_command_line(int argc, char *argv[]) for (int i = 0; i < argc; i++) results.emplace_back(argv[i]); } -#endif // WIN32 +#endif // _WIN32 return results; } |