[Scummvm-git-logs] scummvm master -> 58eedff7d1ac9c2738a304c20b896618680540df
sev-
noreply at scummvm.org
Tue Oct 31 23:24:43 UTC 2023
This automated email contains information about 6 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
7e4c81e1ff GRAPHICS: MACGUI: Pass image extensions from Markdown to MacTextCanvas
fc00188eeb GRAPHICS: MACGUI: Parse image extension string into a fixed format
ddadee5daf GRAPHICS: MACGUI: Copy defaultFormatting to MacTextCanvas
175bf5c001 GRAPHICS: MACGUI: Use image extensiosn for calculating image dimensions in MacTextCanvas
86a289ea32 IOS: Make image dimensions in help text dependent on the font size
58eedff7d1 ANDROID: Adjusted image sizes in help text
Commit: 7e4c81e1ff1867c5cdd3abe0d4d4bf005c1e8e03
https://github.com/scummvm/scummvm/commit/7e4c81e1ff1867c5cdd3abe0d4d4bf005c1e8e03
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-10-31T22:55:09+01:00
Commit Message:
GRAPHICS: MACGUI: Pass image extensions from Markdown to MacTextCanvas
Changed paths:
graphics/macgui/mactext-canvas.cpp
graphics/macgui/mactext-canvas.h
graphics/macgui/mactext-md.cpp
graphics/macgui/macwindowmanager.cpp
diff --git a/graphics/macgui/mactext-canvas.cpp b/graphics/macgui/mactext-canvas.cpp
index 2c464c06d0c..9f1fc7933d9 100644
--- a/graphics/macgui/mactext-canvas.cpp
+++ b/graphics/macgui/mactext-canvas.cpp
@@ -327,10 +327,14 @@ const Common::U32String::value_type *MacTextCanvas::splitString(const Common::U3
_text[curLine].pictitle = Common::U32String(s, len);
s += len;
- D(9, "** splitString[i]: %d%% fname: '%s' alt: '%s' title: '%s'",
+ s = readHex(&len, s, 2);
+ _text[curLine].picext = Common::U32String(s, len);
+ s += len;
+
+ D(9, "** splitString[i]: %d%% fname: '%s' alt: '%s' title: '%s' ext: '%s'",
_text[curLine].picpercent,
_text[curLine].picfname.c_str(), _text[curLine].picalt.encode().c_str(),
- _text[curLine].pictitle.encode().c_str());
+ _text[curLine].pictitle.encode().c_str(), _text[curLine].picext.encode().c_str());
break;
}
diff --git a/graphics/macgui/mactext-canvas.h b/graphics/macgui/mactext-canvas.h
index fd2079fe23a..2490b9559e9 100644
--- a/graphics/macgui/mactext-canvas.h
+++ b/graphics/macgui/mactext-canvas.h
@@ -183,7 +183,7 @@ struct MacTextLine {
int indent = 0; // in units
int firstLineIndent = 0; // in pixels
Common::String picfname;
- Common::U32String picalt, pictitle;
+ Common::U32String picalt, pictitle, picext;
uint16 picpercent = 50;
Common::Array<MacTextTableRow> *table = nullptr;
ManagedSurface *tableSurface = nullptr;
diff --git a/graphics/macgui/mactext-md.cpp b/graphics/macgui/mactext-md.cpp
index a33967e2c29..f2988293bbb 100644
--- a/graphics/macgui/mactext-md.cpp
+++ b/graphics/macgui/mactext-md.cpp
@@ -239,9 +239,16 @@ int render_image(Common::SDDataBuffer *ob, const Common::SDDataBuffer *link, con
res += "00";
if (title)
- res += Common::String::format("%02x%s\n", (uint)title->size, Common::String((const char *)title->data, title->size).c_str());
+ res += Common::String::format("%02x%s", (uint)title->size, Common::String((const char *)title->data, title->size).c_str());
else
- res += "00\n";
+ res += "00";
+
+ if (ext)
+ res += Common::String::format("%02x%s", (uint)ext->size, Common::String((const char *)ext->data, ext->size).c_str());
+ else
+ res += "00";
+
+ res += "\n";
sd_bufput(ob, res.c_str(), res.size());
diff --git a/graphics/macgui/macwindowmanager.cpp b/graphics/macgui/macwindowmanager.cpp
index c21a646e879..039172798fb 100644
--- a/graphics/macgui/macwindowmanager.cpp
+++ b/graphics/macgui/macwindowmanager.cpp
@@ -610,6 +610,7 @@ Common::U32String stripFormat(const Common::U32String &str) {
res += ']';
s = readHex(&len, s, 2); // title
+ s = readHex(&len, s, 2); // ext
s += len;
} else if (*s == 't') { // font
s += 5;
Commit: fc00188eebe57f2d0b0d91159d9cd18bffb7289f
https://github.com/scummvm/scummvm/commit/fc00188eebe57f2d0b0d91159d9cd18bffb7289f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-10-31T22:55:14+01:00
Commit Message:
GRAPHICS: MACGUI: Parse image extension string into a fixed format
Changed paths:
graphics/macgui/mactext-canvas.cpp
diff --git a/graphics/macgui/mactext-canvas.cpp b/graphics/macgui/mactext-canvas.cpp
index 9f1fc7933d9..7fd8a9df0f9 100644
--- a/graphics/macgui/mactext-canvas.cpp
+++ b/graphics/macgui/mactext-canvas.cpp
@@ -122,6 +122,86 @@ void MacTextCanvas::splitString(const Common::U32String &str, int curLine, MacFo
(void)splitString(str.c_str(), curLine, defaultFormatting);
}
+Common::String preprocessImageExt(const char *ptr) {
+ // w[idth]=WWWw -- width in units 'w'
+ // h[eight]=HHHh -- height in units 'h'
+ //
+ // units:
+ // % for percents of the text width -> %
+ // em for font height as a unit -> e
+ // px for actual pixels -> p
+ //
+ // Translated into fixed format:
+ // WWWWwHHHHh -- 4 fixed hex numbers followed by units
+
+ int w = 0, h = 0;
+ char wu = ' ', hu = ' ';
+
+ enum {
+ kStateNone,
+ kStateW,
+ kStateH,
+ };
+
+ int state = kStateNone;
+
+ while (*ptr) {
+ if (*ptr == ' ' || *ptr == '\t') {
+ ptr++;
+ continue;
+ }
+
+ if (*ptr == 'w' || *ptr == 'h') {
+ state = *ptr == 'w' ? kStateW : kStateH;
+
+ while (*ptr && *ptr != '=')
+ ptr++;
+
+ if (*ptr != '=') {
+ warning("MacTextCanvas: Malformatted image extention: '=' expected at '%s'", ptr);
+ return "";
+ }
+ } else if (Common::isDigit(*ptr)) {
+ int num = 0;
+
+ if (state == kStateNone) {
+ warning("MacTextCanvas: Malformatted image extention: unexpected digit at '%s'", ptr);
+ return "";
+ }
+
+ while (*ptr && Common::isDigit(*ptr)) {
+ num *= 10;
+ num += *ptr - '0';
+
+ ptr++;
+ }
+
+ if (*ptr == 'e' || *ptr == '%' || *ptr == 'p') {
+ if (state == kStateW) {
+ w = num;
+ wu = *ptr;
+ } else {
+ h = num;
+ hu = *ptr;
+ }
+
+ while (*ptr && *ptr != ' ' && *ptr != '\t')
+ ptr++;
+ } else {
+ warning("MacTextCanvas: Malformatted image extention: %% or e[m] or p[x] expected at '%s'", ptr);
+ return "";
+ }
+ } else {
+ warning("MacTextCanvas: Malformatted image extention: w[idth] or h[eight] expected at '%s'", ptr);
+ return "";
+ }
+
+ ptr++;
+ }
+
+ return Common::String::format("%04x%c%04x%c", w, wu, h, hu);
+}
+
const Common::U32String::value_type *MacTextCanvas::splitString(const Common::U32String::value_type *s, int curLine, MacFontRun &defaultFormatting) {
if (_text.empty()) {
_text.resize(1);
@@ -328,7 +408,7 @@ const Common::U32String::value_type *MacTextCanvas::splitString(const Common::U3
s += len;
s = readHex(&len, s, 2);
- _text[curLine].picext = Common::U32String(s, len);
+ _text[curLine].picext = preprocessImageExt(Common::U32String(s, len).encode().c_str());
s += len;
D(9, "** splitString[i]: %d%% fname: '%s' alt: '%s' title: '%s' ext: '%s'",
Commit: ddadee5daf19bc27703824f7a7c2d752afb93686
https://github.com/scummvm/scummvm/commit/ddadee5daf19bc27703824f7a7c2d752afb93686
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-10-31T23:16:13+01:00
Commit Message:
GRAPHICS: MACGUI: Copy defaultFormatting to MacTextCanvas
Changed paths:
graphics/macgui/mactext-canvas.cpp
graphics/macgui/mactext-canvas.h
diff --git a/graphics/macgui/mactext-canvas.cpp b/graphics/macgui/mactext-canvas.cpp
index 7fd8a9df0f9..e4a81bdc170 100644
--- a/graphics/macgui/mactext-canvas.cpp
+++ b/graphics/macgui/mactext-canvas.cpp
@@ -211,6 +211,8 @@ const Common::U32String::value_type *MacTextCanvas::splitString(const Common::U3
D(9, "** splitString, continuing, %d lines", _text.size());
}
+ _defaultFormatting = defaultFormatting;
+
Common::U32String tmp;
if (curLine == -1 || curLine >= (int)_text.size())
@@ -327,7 +329,7 @@ const Common::U32String::value_type *MacTextCanvas::splitString(const Common::U3
s = readHex(&headSize, s, 1);
if (headSize == 0xf) // reset
- chunk.fontSize = defaultFormatting.fontSize;
+ chunk.fontSize = _defaultFormatting.fontSize;
s = readHex(&indent, s, 1);
@@ -360,10 +362,10 @@ const Common::U32String::value_type *MacTextCanvas::splitString(const Common::U3
case ']': { // \016] -- setting default color
s++;
- chunk.palinfo1 = defaultFormatting.palinfo1;
- chunk.palinfo2 = defaultFormatting.palinfo2;
- chunk.palinfo3 = defaultFormatting.palinfo3;
- chunk.fgcolor = defaultFormatting.fgcolor;
+ chunk.palinfo1 = _defaultFormatting.palinfo1;
+ chunk.palinfo2 = _defaultFormatting.palinfo2;
+ chunk.palinfo3 = _defaultFormatting.palinfo3;
+ chunk.fgcolor = _defaultFormatting.fgcolor;
D(9, "** splitString]: %08x", chunk.fgcolor);
break;
@@ -425,7 +427,7 @@ const Common::U32String::value_type *MacTextCanvas::splitString(const Common::U3
s = readHex(&fontId, s, 4);
- chunk.fontId = fontId == 0xffff ? defaultFormatting.fontId : fontId;
+ chunk.fontId = fontId == 0xffff ? _defaultFormatting.fontId : fontId;
D(9, "** splitString[t]: fontId: %d", fontId);
break;
@@ -460,7 +462,7 @@ const Common::U32String::value_type *MacTextCanvas::splitString(const Common::U3
inTable = false;
D(9, "** splitString[body end]");
- processTable(curLine, _maxWidth, defaultFormatting);
+ processTable(curLine, _maxWidth);
continue;
} else if (cmd == 'r') { // Row
@@ -485,7 +487,7 @@ const Common::U32String::value_type *MacTextCanvas::splitString(const Common::U3
D(9, "** splitString[RECURSION start]");
- s = cellCanvas->splitString(s, curLine, defaultFormatting);
+ s = cellCanvas->splitString(s, curLine, _defaultFormatting);
D(9, "** splitString[RECURSION end]");
} else if (cmd == 'C') { // Cell end
@@ -515,7 +517,7 @@ const Common::U32String::value_type *MacTextCanvas::splitString(const Common::U3
// So far, we enforce single font here, though in the future, font size could be altered
if (!_macFontMode)
- chunk.font = defaultFormatting.font;
+ chunk.font = _defaultFormatting.font;
}
}
}
@@ -542,7 +544,7 @@ const Common::U32String::value_type *MacTextCanvas::splitString(const Common::U3
// if the chunks is empty, which means the line will not be rendered properly
// so we add a empty string here
if (curTextLine->chunks.empty()) {
- curTextLine->chunks.push_back(defaultFormatting);
+ curTextLine->chunks.push_back(_defaultFormatting);
}
if (*s) {
@@ -981,6 +983,8 @@ Common::U32String MacTextCanvas::getTextChunk(int startRow, int startCol, int en
}
void MacTextCanvas::reshuffleParagraph(int *row, int *col, MacFontRun &defaultFormatting) {
+ _defaultFormatting = defaultFormatting;
+
// First, we looking for the paragraph start and end
int start = *row, end = *row;
@@ -1090,20 +1094,22 @@ void MacTextCanvas::setMaxWidth(int maxWidth, MacFontRun &defaultFormatting) {
return;
}
+ _defaultFormatting = defaultFormatting;
+
_maxWidth = maxWidth;
int row, col = 0;
for (uint i = 0; i < _text.size(); i++) {
row = i;
- reshuffleParagraph(&row, &col, defaultFormatting);
+ reshuffleParagraph(&row, &col, _defaultFormatting);
while (i < _text.size() - 1 && !_text[i].paragraphEnd)
i++;
}
}
-void MacTextCanvas::processTable(int line, int maxWidth, MacFontRun &defaultFormatting) {
+void MacTextCanvas::processTable(int line, int maxWidth) {
Common::Array<MacTextTableRow> *table = _text[line].table;
uint numCols = table->front().cells.size();
uint numRows = table->size();
@@ -1197,7 +1203,7 @@ void MacTextCanvas::processTable(int line, int maxWidth, MacFontRun &defaultForm
int c = 0;
rowH[r] = 0;
for (auto &cell : row.cells) {
- cell.setMaxWidth(colW[c], defaultFormatting);
+ cell.setMaxWidth(colW[c], _defaultFormatting);
cell.recalcDims();
cell.reallocSurface();
diff --git a/graphics/macgui/mactext-canvas.h b/graphics/macgui/mactext-canvas.h
index 2490b9559e9..2b3941da27c 100644
--- a/graphics/macgui/mactext-canvas.h
+++ b/graphics/macgui/mactext-canvas.h
@@ -121,6 +121,7 @@ public:
uint32 _tbgcolor = 0;
bool _macFontMode = true;
MacText *_macText;
+ MacFontRun _defaultFormatting;
public:
~MacTextCanvas() {
@@ -162,9 +163,10 @@ public:
void reshuffleParagraph(int *row, int *col, MacFontRun &defaultFormatting);
void setMaxWidth(int maxWidth, MacFontRun &defaultFormatting);
- void processTable(int line, int maxWidth, MacFontRun &defaultFormatting);
-
void debugPrint(const char *prefix = nullptr);
+
+private:
+ void processTable(int line, int maxWidth);
};
struct MacTextTableRow {
Commit: 175bf5c00171773d9a9fd963d043051948c4f18c
https://github.com/scummvm/scummvm/commit/175bf5c00171773d9a9fd963d043051948c4f18c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-11-01T00:16:00+01:00
Commit Message:
GRAPHICS: MACGUI: Use image extensiosn for calculating image dimensions in MacTextCanvas
Changed paths:
graphics/macgui/mactext-canvas.cpp
graphics/macgui/mactext-canvas.h
diff --git a/graphics/macgui/mactext-canvas.cpp b/graphics/macgui/mactext-canvas.cpp
index e4a81bdc170..5aaa1e9f667 100644
--- a/graphics/macgui/mactext-canvas.cpp
+++ b/graphics/macgui/mactext-canvas.cpp
@@ -177,12 +177,13 @@ Common::String preprocessImageExt(const char *ptr) {
}
if (*ptr == 'e' || *ptr == '%' || *ptr == 'p') {
+ char unit = *ptr == 'e' ? 'm' : *ptr;
if (state == kStateW) {
w = num;
- wu = *ptr;
+ wu = unit;
} else {
h = num;
- hu = *ptr;
+ hu = unit;
}
while (*ptr && *ptr != ' ' && *ptr != '\t')
@@ -733,6 +734,91 @@ int getStringMaxWordWidth(MacFontRun &format, const Common::U32String &str) {
}
}
+void MacTextCanvas::parsePicExt(const Common::U32String &ext, uint16 &wOut, uint16 &hOut, int defpercent) {
+ const Common::U32String::value_type *s = ext.c_str();
+
+ D(9, "P: %s", ext.encode().c_str());
+
+ // wwwwWhhhhH
+ // 0123456789
+
+ bool useDefault = false;
+
+ if (ext.size() == 10 && s[4] != ' ' && s[9] != ' ' && s[4] != s[9]) {
+ warning("MacTextCanvas: Non-matching dimension unitss in image extension: '%s'", ext.encode().c_str());
+
+ useDefault = true;
+ }
+
+ // if it is empty or without dimensions, use default width percrent
+ if (useDefault || ext.size() < 10 || (s[4] == ' ' && s[9] == ' ')) {
+ float ratio = _maxWidth * defpercent / 100.0 / (float)wOut;
+
+ wOut = wOut * ratio;
+ hOut = hOut * ratio;
+
+ return;
+ }
+
+ uint16 w, h;
+
+ (void)readHex(&w, s, 4);
+ (void)readHex(&h, &s[5], 4);
+
+ D(9, "w: %d%c h: %d%c", w, s[4], h, s[9]);
+
+ if (s[9] == '%') {
+ warning("MacTextCanvas: image height in %% is not supported");
+ h = 0;
+ }
+
+ float ratio;
+
+ // Percent of the total width
+ if (s[4] == '%') {
+ ratio = _maxWidth * w / 100.0 / (float)wOut;
+
+ // Size in em (font height) units
+ } else if (s[4] == 'm' || s[5] == 'm') {
+ int em = _defaultFormatting.fontSize;
+ D(9, "em: %d", em);
+ if (w != 0 && h != 0) {
+ wOut = em * w;
+ hOut = em * h;
+
+ return;
+ }
+
+ // now we need to compute ratio
+ if (w != 0)
+ ratio = em * w / (float)wOut;
+ else
+ ratio = em * h / (float)hOut;
+
+ // Size in pixels
+ } else if (s[4] == 'p' || s[5] == 'p') {
+ if (w != 0 && h != 0) {
+ wOut = w;
+ hOut = h;
+
+ return;
+ }
+
+ // now we need to compute ratio
+ if (w != 0)
+ ratio = w / 100 / (float)wOut;
+ else
+ ratio = h / 100 / (float)hOut;
+ } else {
+ error("MacTextCanvas: malformed image extension '%s", ext.encode().c_str());
+ }
+
+ D(9, "ratio is %f", ratio);
+
+ wOut = wOut * ratio;
+ hOut = hOut * ratio;
+}
+
int MacTextCanvas::getLineWidth(int lineNum, bool enforce, int col) {
if ((uint)lineNum >= _text.size())
return 0;
@@ -746,10 +832,13 @@ int MacTextCanvas::getLineWidth(int lineNum, bool enforce, int col) {
const Surface *image = _macText->getImageSurface(line->picfname);
if (image) {
- float ratio = _maxWidth * line->picpercent / 100.0 / (float)image->w;
line->width = _maxWidth;
- line->height = image->h * ratio;
- line->charwidth = image->w * ratio;
+
+ uint16 w = image->w, h = image->h;
+
+ parsePicExt(line->picext, w, h, line->picpercent);
+ line->charwidth = w;
+ line->height = h;
} else {
line->width = _maxWidth;
line->height = 1;
diff --git a/graphics/macgui/mactext-canvas.h b/graphics/macgui/mactext-canvas.h
index 2b3941da27c..9b0ceea7a8b 100644
--- a/graphics/macgui/mactext-canvas.h
+++ b/graphics/macgui/mactext-canvas.h
@@ -167,6 +167,7 @@ public:
private:
void processTable(int line, int maxWidth);
+ void parsePicExt(const Common::U32String &ext, uint16 &w, uint16 &h, int defpercent);
};
struct MacTextTableRow {
Commit: 86a289ea32240bf7f57c31557eb15fb5c639e79b
https://github.com/scummvm/scummvm/commit/86a289ea32240bf7f57c31557eb15fb5c639e79b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-11-01T00:17:38+01:00
Commit Message:
IOS: Make image dimensions in help text dependent on the font size
Changed paths:
backends/platform/ios7/ios7_osys_misc.mm
diff --git a/backends/platform/ios7/ios7_osys_misc.mm b/backends/platform/ios7/ios7_osys_misc.mm
index 507f96714e4..9fe5f870a1a 100644
--- a/backends/platform/ios7/ios7_osys_misc.mm
+++ b/backends/platform/ios7/ios7_osys_misc.mm
@@ -225,7 +225,7 @@ Common::HardwareInputSet *OSystem_iOS7::getHardwareInputSet() {
}
inputSet->addHardwareInputSet(new KeyboardHardwareInputSet(defaultKeys, defaultModifiers));
-
+
return inputSet;
}
@@ -256,13 +256,13 @@ _s(
"\n"
"The touch controls are direct. The pointer jumps to where the finger touches the screen (default for menus).\n"
"\n"
-" ![Direct mouse mode](mouse.png \"Direct mouse mode\")\n"
+" ![Direct mouse mode](mouse.png \"Direct mouse mode\"){w=10em}\n"
"\n"
"### Touchpad emulation \n"
"\n"
"The touch controls are indirect, like on a laptop touchpad.\n"
"\n"
-" ![Touchpad mode](touchpad.png \"Touchpad mode\")\n"
+" ![Touchpad mode](touchpad.png \"Touchpad mode\"){w=10em}\n"
"\n"
"To select the preferred touch mode for menus, 2D games, and 3D games, go to **Global Options > Backend > Choose the preferred touch mode**.\n"
"\n"
@@ -292,14 +292,14 @@ _s(
"\n"
"To open the Global Main Menu, tap on the menu icon at the top right of the screen or by swiping two fingers downwards.\n"
"\n"
-" ![Menu icon](menu.png \"Menu icon\")\n"
+" ![Menu icon](menu.png \"Menu icon\"){w=10em}\n"
"\n"
"## Virtual keyboard\n"
"\n"
"To open the virtual keyboard, long press on the controller icon at the top right of the screen, perform a pinch gesture (zoom out) or tap on any editable text field. To hide the virtual keyboard, tap the controller icon again, do an opposite pinch gesture (zoom in) or tap outside the text field.\n"
"\n"
"\n"
-" ![Keybpard icon](keyboard.png \"Keyboard icon\")\n"
+" ![Keybpard icon](keyboard.png \"Keyboard icon\"){w=10em}\n"
"\n"
),
Commit: 58eedff7d1ac9c2738a304c20b896618680540df
https://github.com/scummvm/scummvm/commit/58eedff7d1ac9c2738a304c20b896618680540df
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-11-01T00:24:11+01:00
Commit Message:
ANDROID: Adjusted image sizes in help text
Changed paths:
backends/platform/android/android.cpp
diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp
index 049921fb167..438ab8c0a95 100644
--- a/backends/platform/android/android.cpp
+++ b/backends/platform/android/android.cpp
@@ -1037,19 +1037,19 @@ _s(
"\n"
"The touch controls are direct. The pointer jumps to where the finger touches the screen (default for menus).\n"
"\n"
-" ![Direct mouse mode](mouse.png \"Direct mouse mode\")\n"
+" ![Direct mouse mode](mouse.png \"Direct mouse mode\"){w=10em}\n"
"\n"
"### Touchpad emulation \n"
"\n"
"The touch controls are indirect, like on a laptop touchpad.\n"
"\n"
-" ![Touchpad mode](touchpad.png \"Touchpad mode\")\n"
+" ![Touchpad mode](touchpad.png \"Touchpad mode\"){w=10em}\n"
"\n"
"### Gamepad emulation \n"
"\n"
"Fingers must be placed on lower left and right of the screen to emulate a directional pad and action buttons.\n"
"\n"
-" ![Gamepad mode](gamepad.png \"Gamepad mode\")\n"
+" ![Gamepad mode](gamepad.png \"Gamepad mode\"){w=10em}\n"
"\n"
"To select the preferred touch mode for menus, 2D games, and 3D games, go to **Global Options > Backend > Choose the preferred touch mode**.\n"
"\n"
@@ -1075,14 +1075,14 @@ _s(
"\n"
"To open the Global Main Menu, tap on the menu icon at the top right of the screen.\n"
"\n"
-" ![Menu icon](menu.png \"Menu icon\")\n"
+" ![Menu icon](menu.png \"Menu icon\"){w=10em}\n"
"\n"
"## Virtual keyboard\n"
"\n"
"To open the virtual keyboard, long press on the controller icon at the top right of the screen, or tap on any editable text field. To hide the virtual keyboard, tap the controller icon again, or tap outside the text field.\n"
"\n"
"\n"
-" ![Keybpard icon](keyboard.png \"Keyboard icon\")\n"
+" ![Keybpard icon](keyboard.png \"Keyboard icon\"){w=10em}\n"
"\n"
),
@@ -1095,21 +1095,21 @@ _s(
"\n"
"2. Inside the ScummVM file browser, select **Go Up** until you reach the root folder which has the **<Add a new folder>** option. \n"
"\n"
-" ![ScummVM file browser root](browser-root.png \"ScummVM file browser root\")\n"
+" ![ScummVM file browser root](browser-root.png \"ScummVM file browser root\"){w=70%}\n"
"\n"
"3. Double-tap **<Add a new folder>**. In your device's file browser, navigate to the folder containing all your game folders. For example, **SD Card > ScummVMgames**. \n"
"\n"
"4. Select **Use this folder**. \n"
"\n"
-" ![OS selectable folder](fs-folder.png \"OS selectable folder\")\n"
+" ![OS selectable folder](fs-folder.png \"OS selectable folder\"){w=70%}\n"
"\n"
"5. Select **ALLOW** to give ScummVM permission to access the folder. \n"
"\n"
-" ![OS access permission dialog](fs-permission.png \"OS access permission\")\n"
+" ![OS access permission dialog](fs-permission.png \"OS access permission\"){w=70%}\n"
"\n"
"6. In the ScummVM file browser, double-tap to browse through your added folder. Add a game by selecting the sub-folder containing the game files, then tap **Choose**. \n"
"\n"
-" ![SAF folder added](browser-folder-in-list.png \"SAF folder added\")\n"
+" ![SAF folder added](browser-folder-in-list.png \"SAF folder added\"){w=70%}\n"
"\n"
"Step 2 and 3 are done only once. To add more games, repeat Steps 1 and 6. \n"
"\n"
More information about the Scummvm-git-logs
mailing list