ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

replace launcher's small font with bold version 

add 'small medium' font to launcher font options
doc update for variable ROM viewer widths and new launcher font size
This commit is contained in:
thrust26 2020-03-14 11:14:24 +01:00
parent 4b66fc08f1
commit da3d183e75
6 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Changes.txt
View File

@ -119,9 +119,10 @@
* Added option to change pitch of Pitfall II music.
* ROM Info Launcher can now display multiple lines per property and
bank switching type. Related to this, added fractional (25% increments)
snapshot zooms.
* ROM Info Viewer size is not limited to fixed zoom steps anymore.
* ROM Info Viewer can now display multiple lines per property and the
bank switching type.
* In file listings, you can now select directories by holding 'Shift' on
the first character entered. Entering characters in lowercase still

BIN
docs/graphics/options_ui.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

35
docs/index.html
View File

@ -2371,7 +2371,7 @@
</tr>
<tr>
<td><pre>-launcherfont &lt;small|medium|large&gt;</pre></td>
<td><pre>-launcherfont &lt;small|small medium|medium|large&gt;</pre></td>
<td>Set the size of the font in the ROM launcher.</td>
</tr>
@ -2382,9 +2382,10 @@
</tr>
<tr>
<td><pre>-romviewer &lt;0|1|2&gt;</pre></td>
<td>Hide ROM Info Viewer in ROM launcher mode (0), or use the
given zoom level (1 or 2).</td>
<td><pre>-romviewer &lt;float&gt;</pre></td>
<td>Hide ROM Info Viewer in ROM launcher mode (0) or use the
given zoom level.</br>
Note: The zoom level is converted into a percentage in the UI.</td>
</tr>
<tr>
@ -3079,8 +3080,8 @@
launcher and fonts, as well as the 'ROM Info Viewer' can be changed in
<b>UI Settings - Launcher</b> dialog, as shown below:</p>
<img src="graphics/options_ui.png">
<p>Most of the options are self-explanatory, except for the 'ROM Info
viewer', which is described below.</p>
<p>Most of the options are self-explanatory, except for the 'ROM info
width', which is described below.</p>
<h3><b><a name="ROMInfoViewer">ROM Info Viewer</a></b></h3>
@ -3092,27 +3093,21 @@
for each new release of Stella. Note that the snapshots can be any size
generated by Stella; they will be resized accordingly.</p>
<p>Currently, there are several restrictions for this feature:</p>
<ol>
<li>The ROM Info Viewer can be shown in 1x or 2x mode only.</li>
<li>To view snapshots in 1x mode, the ROM launcher window must be sized at
least 640x480. If the launcher isn't large enough, the functionality
will be disabled.</li>
<li>To view snapshots in 2x mode, the ROM launcher window must be sized at
least 1000x720. If the launcher isn't large enough, an attempt will
be made to use 1x mode.</li>
</ol>
The ROM Info Viewer's width can be defined between 0% (off) and 100%. The
value is relative to the launcher width. For too small or too large values,
Stella will automatically correct the width at runtime so that the ROM names
and the current ROM's information always have enough space.
<p>The following snapshots illustrate the various font sizes and rom info
zoom levels:</p>
widths:</p>
<p>ROM Info Viewer in 1x mode, UI sized 800x480, small launcher font:</p>
<p>ROM Info Viewer width at 40%, UI sized 800x480, small launcher font:</p>
<img src="graphics/rominfo_1x_small.png">
<p>ROM Info Viewer in 1x mode, UI sized 1000x720, medium launcher font:</p>
<p>ROM Info Viewer width at 32%, UI sized 1000x720, medium launcher font:</p>
<img src="graphics/rominfo_1x_large.png">
<p>ROM Info Viewer in 2x mode, UI sized 1280x900, large launcher font:</p>
<p>ROM Info Viewer width at 50% , UI sized 1280x900, large launcher font:</p>
<img src="graphics/rominfo_2x_small.png">
<p>The text box in the upper right corner can be used to narrow down the

14
src/emucore/FrameBuffer.cxx
View File

@ -36,9 +36,11 @@
#ifdef GUI_SUPPORT
#include "Font.hxx"
#include "StellaFont.hxx"
#include "ConsoleMediumBFont.hxx"
#include "StellaMediumFont.hxx"
#include "StellaLargeFont.hxx"
#include "ConsoleFont.hxx"
#include "ConsoleBFont.hxx"
#include "Launcher.hxx"
#include "Menu.hxx"
#include "CommandMenu.hxx"
@ -106,7 +108,7 @@ bool FrameBuffer::initialize()
// This font is used in a variety of situations when a really small
// font is needed; we let the specific widget/dialog decide when to
// use it
mySmallFont = make_unique<GUI::Font>(GUI::stellaDesc);
mySmallFont = make_unique<GUI::Font>(GUI::stellaDesc); // 6x10
// The general font used in all UI elements
// This is determined by the size of the framebuffer
@ -117,16 +119,18 @@ bool FrameBuffer::initialize()
// The info font used in all UI elements
// This is determined by the size of the framebuffer
myInfoFont = make_unique<GUI::Font>(GUI::consoleDesc);
myInfoFont = make_unique<GUI::Font>(GUI::consoleDesc); // 8x13
// The font used by the ROM launcher
const string& lf = myOSystem.settings().getString("launcherfont");
if(lf == "small")
myLauncherFont = make_unique<GUI::Font>(GUI::consoleDesc);
myLauncherFont = make_unique<GUI::Font>(GUI::consoleBDesc); // 8x13
else if(lf == "small medium")
myLauncherFont = make_unique<GUI::Font>(GUI::consoleMediumBDesc); // 9x15
else if(lf == "medium")
myLauncherFont = make_unique<GUI::Font>(GUI::stellaMediumDesc);
myLauncherFont = make_unique<GUI::Font>(GUI::stellaMediumDesc); // 9x18
else
myLauncherFont = make_unique<GUI::Font>(GUI::stellaLargeDesc);
myLauncherFont = make_unique<GUI::Font>(GUI::stellaLargeDesc); // 10x20
#endif
// Determine possible TIA windowed zoom levels

8
src/emucore/Settings.cxx
View File

@ -342,7 +342,7 @@ void Settings::validate()
setValue("palette", "standard");
s = getString("launcherfont");
if(s != "small" && s != "medium" && s != "large")
if(s != "small" && s != "small medium" && s != "medium" && s != "large")
setValue("launcherfont", "medium");
s = getString("dbg.fontsize");
@ -478,10 +478,10 @@ void Settings::usage() const
<< " -exitlauncher <1|0> On exiting a ROM, go back to the ROM launcher\n"
<< " -launcherres <WxH> The resolution to use in ROM launcher mode\n"
<< " -launcherfont <small|medium| Use the specified font in the ROM launcher\n"
<< " large>\n"
<< " small medium|large>\n"
<< " -launcherroms <1|0> Show only ROMs in the launcher (vs. all files)\n"
<< " -romviewer <0|1|2> Show ROM info viewer at given zoom level in ROM\n"
<< " launcher (0 for off)\n"
<< " -romviewer <float> Show ROM info viewer at given zoom level in ROM\n"
<< " launcher (use 0 for off)\n"
<< " -lastrom <name> Last played ROM, automatically selected in launcher\n"
<< " -romloadcount <number> Number of ROM to load next from multicard\n"
<< " -uipalette <standard| Selects GUI theme\n"

1
src/gui/UIDialog.cxx
View File

@ -217,6 +217,7 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent,
pwidth = font.getStringWidth("2x (1000x760)");
items.clear();
VarList::push_back(items, "Small", "small");
VarList::push_back(items, "Small Medium", "small medium");
VarList::push_back(items, "Medium", "medium");
VarList::push_back(items, "Large", "large");
myLauncherFontPopup =