summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Kendall <mkendall@mythtv.org>2011-11-07 19:36:28 (GMT)
committer Mark Kendall <mkendall@mythtv.org>2011-11-07 19:36:28 (GMT)
commita2e143f7c77349afcf5cf147a1e4765a2a54db21 (patch)
treeab3ca91cc293be22087efef6e61f05ed580e3887
parent99bff1a96f1d2e18bbcdcade1d416922704d5ec9 (diff)
OSD: Fix screen ordering again.
Ref #9941
-rw-r--r--mythtv/libs/libmythtv/osd.h37
1 files changed, 20 insertions, 17 deletions
diff --git a/mythtv/libs/libmythtv/osd.h b/mythtv/libs/libmythtv/osd.h
index 6df06ba..8a33cbc 100644
--- a/mythtv/libs/libmythtv/osd.h
+++ b/mythtv/libs/libmythtv/osd.h
@@ -5,25 +5,28 @@
#include "programtypes.h"
#include "mythscreentype.h"
-#define OSD_DLG_VIDEOEXIT "OSD_VIDEO_EXIT"
-#define OSD_DLG_MENU "OSD_MENU"
-#define OSD_DLG_SLEEP "OSD_SLEEP"
-#define OSD_DLG_IDLE "OSD_IDLE"
-#define OSD_DLG_INFO "OSD_INFO"
-#define OSD_DLG_EDITING "OSD_EDITING"
-#define OSD_DLG_ASKALLOW "OSD_ASKALLOW"
-#define OSD_DLG_EDITOR "OSD_EDITOR"
-#define OSD_DLG_CUTPOINT "OSD_CUTPOINT"
-#define OSD_DLG_DELETE "OSD_DELETE"
+// Screen names are prepended with alphanumerics to force the correct ordering
+// when displayed. This is slightly complicated by the default windows
+// (e.g. osd_window) whose names are hard coded into existing themes.
+
+// menu dialogs should always be on top
+#define OSD_DLG_VIDEOEXIT "xx_OSD_VIDEO_EXIT"
+#define OSD_DLG_MENU "xx_OSD_MENU"
+#define OSD_DLG_SLEEP "xx_OSD_SLEEP"
+#define OSD_DLG_IDLE "xx_OSD_IDLE"
+#define OSD_DLG_INFO "xx_OSD_INFO"
+#define OSD_DLG_EDITING "xx_OSD_EDITING"
+#define OSD_DLG_ASKALLOW "xx_OSD_ASKALLOW"
+#define OSD_DLG_EDITOR "xx_OSD_EDITOR"
+#define OSD_DLG_CUTPOINT "xx_OSD_CUTPOINT"
+#define OSD_DLG_DELETE "xx_OSD_DELETE"
#define OSD_DLG_CONFIRM "mythconfirmpopup"
-// Force subtitle/interactive screens to be drawn first (i.e. at the back) by
-// prepending their identifiers with a low numeric (may not always work as
-// QMap/QString ordering is based on unicode values)
-#define OSD_WIN_TELETEXT "00_OSD_TELETEXT"
-#define OSD_WIN_SUBTITLE "00_OSD_SUBTITLES"
+// subtitles are always painted first
+#define OSD_WIN_TELETEXT "aa_OSD_TELETEXT"
+#define OSD_WIN_SUBTITLE "aa_OSD_SUBTITLES"
// MHEG and blu-ray overlay should cover subtitles
-#define OSD_WIN_INTERACT "01_OSD_INTERACTIVE"
-#define OSD_WIN_BDOVERLAY "01_OSD_BDOVERLAY"
+#define OSD_WIN_INTERACT "bb_OSD_INTERACTIVE"
+#define OSD_WIN_BDOVERLAY "bb_OSD_BDOVERLAY"
#define kOSDFadeTime 1000