Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-01-31 04:25:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed an issue where the key repeat in PDFViewer didn't work correctly if pages took a very long time to convert

Browse source
This commit is contained in:
Leon Styhre 2023-08-16 18:33:05 +02:00
parent c945aca6a2
commit 1b055723a3
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
es-app/src/PDFViewer.cpp
View file

@ -37,6 +37,7 @@ PDFViewer::PDFViewer()
, mZoom {1.0f} , mZoom {1.0f}
, mPanAmount {0.0f} , mPanAmount {0.0f}
, mPanOffset {0.0f, 0.0f, 0.0f} , mPanOffset {0.0f, 0.0f, 0.0f}
, mConversionTime {0}
, mKeyRepeatLeftRight {0} , mKeyRepeatLeftRight {0}
, mKeyRepeatUpDown {0} , mKeyRepeatUpDown {0}
, mKeyRepeatZoom {0} , mKeyRepeatZoom {0}
@ -91,6 +92,7 @@ bool PDFViewer::startPDFViewer(FileData* game)
mZoom = 1.0f; mZoom = 1.0f;
mPanAmount = 0.0f; mPanAmount = 0.0f;
mPanOffset = {0.0f, 0.0f, 0.0f}; mPanOffset = {0.0f, 0.0f, 0.0f};
mConversionTime = 0;
mKeyRepeatLeftRight = 0; mKeyRepeatLeftRight = 0;
mKeyRepeatUpDown = 0; mKeyRepeatUpDown = 0;
mKeyRepeatZoom = 0; mKeyRepeatZoom = 0;
@ -340,6 +342,8 @@ bool PDFViewer::getDocumentInfo()
void PDFViewer::convertPage(int pageNum) void PDFViewer::convertPage(int pageNum)
{ {
assert(pageNum <= static_cast<int>(mPages.size())); assert(pageNum <= static_cast<int>(mPages.size()));
const auto conversionStartTime {std::chrono::system_clock::now()};
mConversionTime = 0;
if (mPages[pageNum].imageData.empty()) { if (mPages[pageNum].imageData.empty()) {
#if defined(_WIN64) #if defined(_WIN64)
@ -505,6 +509,9 @@ void PDFViewer::convertPage(int pageNum)
mPanAmount = std::min(mRenderer->getScreenWidth(), mRenderer->getScreenHeight()) * 0.1f; mPanAmount = std::min(mRenderer->getScreenWidth(), mRenderer->getScreenHeight()) * 0.1f;
mConversionTime = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(
std::chrono::system_clock::now() - conversionStartTime)
.count());
#if (DEBUG_PDF_CONVERSION) #if (DEBUG_PDF_CONVERSION)
LOG(LogDebug) << "ABGR32 data stream size: " << mPages[pageNum].imageData.size(); LOG(LogDebug) << "ABGR32 data stream size: " << mPages[pageNum].imageData.size();
#endif #endif
@ -614,10 +621,8 @@ void PDFViewer::input(InputConfig* config, Input input)
void PDFViewer::update(int deltaTime) void PDFViewer::update(int deltaTime)
{ {
if (mKeyRepeatLeftRight != 0) { if (mKeyRepeatLeftRight != 0) {
mKeyRepeatTimer += deltaTime; // Limit the accumulated time if the computer can't keep up.
// Limit the accumulated backlog of keypresses if the computer can't keep up. mKeyRepeatTimer += (deltaTime < KEY_REPEAT_SPEED ? deltaTime : deltaTime - mConversionTime);
if (mKeyRepeatTimer > KEY_REPEAT_SPEED * 2)
mKeyRepeatTimer = KEY_REPEAT_SPEED * 2;
while (mKeyRepeatTimer >= (mZoom > 1.0f ? KEY_REPEAT_SPEED_ZOOMED : KEY_REPEAT_SPEED)) { while (mKeyRepeatTimer >= (mZoom > 1.0f ? KEY_REPEAT_SPEED_ZOOMED : KEY_REPEAT_SPEED)) {
mKeyRepeatTimer -= (mZoom > 1.0f ? KEY_REPEAT_SPEED_ZOOMED : KEY_REPEAT_SPEED); mKeyRepeatTimer -= (mZoom > 1.0f ? KEY_REPEAT_SPEED_ZOOMED : KEY_REPEAT_SPEED);
if (mKeyRepeatLeftRight == 1) if (mKeyRepeatLeftRight == 1)
@ -628,8 +633,6 @@ void PDFViewer::update(int deltaTime)
} }
if (mKeyRepeatUpDown != 0) { if (mKeyRepeatUpDown != 0) {
mKeyRepeatTimer += deltaTime; mKeyRepeatTimer += deltaTime;
if (mKeyRepeatTimer > KEY_REPEAT_SPEED * 2)
mKeyRepeatTimer = KEY_REPEAT_SPEED * 2;
while (mKeyRepeatTimer >= (mZoom > 1.0f ? KEY_REPEAT_SPEED_ZOOMED : KEY_REPEAT_SPEED)) { while (mKeyRepeatTimer >= (mZoom > 1.0f ? KEY_REPEAT_SPEED_ZOOMED : KEY_REPEAT_SPEED)) {
mKeyRepeatTimer -= (mZoom > 1.0f ? KEY_REPEAT_SPEED_ZOOMED : KEY_REPEAT_SPEED); mKeyRepeatTimer -= (mZoom > 1.0f ? KEY_REPEAT_SPEED_ZOOMED : KEY_REPEAT_SPEED);
if (mKeyRepeatUpDown == 1) if (mKeyRepeatUpDown == 1)

1
es-app/src/PDFViewer.h
View file

@ -70,6 +70,7 @@ private:
float mPanAmount; float mPanAmount;
glm::vec3 mPanOffset; glm::vec3 mPanOffset;
int mConversionTime;
int mKeyRepeatLeftRight; int mKeyRepeatLeftRight;
int mKeyRepeatUpDown; int mKeyRepeatUpDown;
int mKeyRepeatZoom; int mKeyRepeatZoom;