saulteafarmer/Stirling-PDF
1
0
Fork 0
mirror of https://github.com/Stirling-Tools/Stirling-PDF.git synced 2025-05-31 06:12:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix desktop client stuck at 90% (#3111)

Browse Source 
So I have added a timer to force show the desktop client after 7seconds
of intiliazation (if not already visible) because it gets stuck at 90%
sometimes

#2487 #2595 

---

## Checklist

### General

- [X] I have read the [Contribution
Guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md)
- [X] I have read the [Stirling-PDF Developer
Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DeveloperGuide.md)
(if applicable)
- [X] I have read the [How to add new languages to
Stirling-PDF](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md)
(if applicable)
- [X] I have performed a self-review of my own code
- [X] My changes generate no new warnings

### Documentation 
-- No functionality change.
### UI Changes (if applicable)

- [X] Screenshots or videos demonstrating the UI changes are attached
(e.g., as comments or direct attachments in the PR)


- [X] I have tested my changes locally. Refer to the [Testing
Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DeveloperGuide.md#6-testing)
for more details.




https://github.com/user-attachments/assets/e889701e-bb21-4a06-b221-98a0faad6f2e
This commit is contained in:
johnmalek312 2025-03-05 02:09:08 +11:00 committed by GitHub
parent 57a49444c6
commit 15d5387fdc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 86 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
src/main/java/stirling/software/SPDF/UI/impl/DesktopBrowser.java
View File

@ -93,8 +93,21 @@ public class DesktopBrowser implements WebBrowser {
setupMainFrame(); setupMainFrame();
setupLoadHandler(); setupLoadHandler();
// Show the frame immediately but transparent // Force initialize UI after 7 seconds if not already done
frame.setVisible(true); Timer timeoutTimer =
new Timer(
2500,
e -> {
log.warn(
"Loading timeout reached. Forcing"
+ " UI transition.");
if (!browserInitialized) {
// Force UI initialization
forceInitializeUI();
}
});
timeoutTimer.setRepeats(false);
timeoutTimer.start();
}); });
} catch (Exception e) { } catch (Exception e) {
log.error("Error initializing JCEF browser: ", e); log.error("Error initializing JCEF browser: ", e);
@ -238,8 +251,8 @@ public class DesktopBrowser implements WebBrowser {
boolean canGoBack, boolean canGoBack,
boolean canGoForward) { boolean canGoForward) {
log.debug( log.debug(
"Loading state change - isLoading: {}, canGoBack: {}, canGoForward: {}, " "Loading state change - isLoading: {}, canGoBack: {}, canGoForward:"
+ "browserInitialized: {}, Time elapsed: {}ms", + " {}, browserInitialized: {}, Time elapsed: {}ms",
isLoading, isLoading,
canGoBack, canGoBack,
canGoForward, canGoForward,
@ -248,7 +261,8 @@ public class DesktopBrowser implements WebBrowser {
if (!isLoading && !browserInitialized) { if (!isLoading && !browserInitialized) {
log.info( log.info(
"Browser finished loading, preparing to initialize UI components"); "Browser finished loading, preparing to initialize UI"
+ " components");
browserInitialized = true; browserInitialized = true;
SwingUtilities.invokeLater( SwingUtilities.invokeLater(
() -> { () -> {
@ -289,10 +303,12 @@ public class DesktopBrowser implements WebBrowser {
browser.getUIComponent() browser.getUIComponent()
.requestFocus(); .requestFocus();
log.info( log.info(
"Browser component focused"); "Browser component"
+ " focused");
} catch (Exception ex) { } catch (Exception ex) {
log.error( log.error(
"Error focusing browser", "Error focusing"
+ " browser",
ex); ex);
} }
}); });
@ -415,4 +431,67 @@ public class DesktopBrowser implements WebBrowser {
if (cefApp != null) cefApp.dispose(); if (cefApp != null) cefApp.dispose();
if (loadingWindow != null) loadingWindow.dispose(); if (loadingWindow != null) loadingWindow.dispose();
} }
public static void forceInitializeUI() {
try {
if (loadingWindow != null) {
log.info("Forcing start of UI initialization sequence");
// Close loading window first
loadingWindow.setVisible(false);
loadingWindow.dispose();
loadingWindow = null;
log.info("Loading window disposed");
// Then setup the main frame
frame.setVisible(false);
frame.dispose();
frame.setOpacity(1.0f);
frame.setUndecorated(false);
frame.pack();
frame.setSize(UIScaling.scaleWidth(1280), UIScaling.scaleHeight(800));
frame.setLocationRelativeTo(null);
log.debug("Frame reconfigured");
// Show the main frame
frame.setVisible(true);
frame.requestFocus();
frame.toFront();
log.info("Main frame displayed and focused");
// Focus the browser component if available
if (browser != null) {
Timer focusTimer =
new Timer(
100,
e -> {
try {
browser.getUIComponent().requestFocus();
log.info("Browser component focused");
} catch (Exception ex) {
log.error(
"Error focusing browser during force ui"
+ " initialization.",
ex);
}
});
focusTimer.setRepeats(false);
focusTimer.start();
}
}
} catch (Exception e) {
log.error("Error during Forced UI initialization.", e);
// Attempt cleanup on error
if (loadingWindow != null) {
loadingWindow.dispose();
loadingWindow = null;
}
if (frame != null) {
frame.setVisible(true);
frame.setOpacity(1.0f);
frame.setUndecorated(false);
frame.requestFocus();
}
}
}
} }