From 7940e622859836ba31c9334ba61f474fc36bcea2 Mon Sep 17 00:00:00 2001
From: Joe R <joeraz5@verizon.net>
Date: Sat, 28 Dec 2024 21:20:58 -0500
Subject: [PATCH] Add topmost logic to HTML viewer

---
 pysollib/app.py  |  3 ++-
 pysollib/help.py | 12 ++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/pysollib/app.py b/pysollib/app.py
index a1203cc1..5b621e49 100644
--- a/pysollib/app.py
+++ b/pysollib/app.py
@@ -35,7 +35,7 @@ from pysollib.app_stat_result import GameStatResult
 from pysollib.app_statistics import Statistics
 from pysollib.cardsetparser import read_cardset_config
 from pysollib.gamedb import GAME_DB, GI, loadGame
-from pysollib.help import destroy_help_html, help_about
+from pysollib.help import destroy_help_html, help_about, raise_help_html
 from pysollib.images import Images, SubsampledImages
 from pysollib.mfxutil import Struct, destruct
 from pysollib.mfxutil import USE_PIL
@@ -523,6 +523,7 @@ class Application:
         raise_find_card_dialog(self.game)
         raise_full_picture_dialog(self.game)
         raise_solver_dialog(self.game)
+        raise_help_html(self.game)
 
     def loadImages1(self):
         # load dialog images
diff --git a/pysollib/help.py b/pysollib/help.py
index e41450d4..dbc83fe0 100644
--- a/pysollib/help.py
+++ b/pysollib/help.py
@@ -160,9 +160,21 @@ def help_html(app, document, dir_, top=None):
     viewer.parent.wm_deiconify()
     viewer.parent.tkraise()
     help_html_viewer = viewer
+    raise_help_html(app.game)
     return viewer
 
 
+def raise_help_html(game):
+    try:
+        if game.app.opt.topmost_dialogs:
+            help_html_viewer.parent.tkraise()
+            help_html_viewer.parent.attributes("-topmost", True)
+        else:
+            help_html_viewer.parent.attributes("-topmost", False)
+    except Exception:
+        pass
+
+
 def destroy_help_html():
     try:
         help_html_viewer.destroy()