Merge pull request #8985 from xhaggi/gui-infobool-window-is

[gui] new infobool Window.Is()
xbmc · Feb 15, 2016 · 0871790 · 0871790
2 parents fb7ff23 + f757ab1
commit 0871790
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp
@@ -681,6 +681,7 @@ const infomap skin_labels[] =    {{ "currenttheme",     SKIN_THEME },
                                   {"aspectratio",       SKIN_ASPECT_RATIO}};
 
 const infomap window_bools[] =   {{ "ismedia",          WINDOW_IS_MEDIA },
+                                  { "is",               WINDOW_IS },
                                   { "isactive",         WINDOW_IS_ACTIVE },
                                   { "istopmost",        WINDOW_IS_TOPMOST },
                                   { "isvisible",        WINDOW_IS_VISIBLE },
@@ -3178,6 +3179,15 @@ bool CGUIInfoManager::GetMultiInfoBool(const GUIInfo &info, int contextWindow, c
             bReturn = true;
         }
         break;
+      case WINDOW_IS:
+        if (info.GetData1())
+        {
+          CGUIWindow *window = g_windowManager.GetWindow(contextWindow);
+          bReturn = (window && window->GetID() == static_cast<int>(info.GetData1()));
+        }
+        else
+          CLog::Log(LOGERROR, "The window id is required.");
+        break;
       case WINDOW_IS_VISIBLE:
         if (info.GetData1())
           bReturn = g_windowManager.IsWindowVisible(info.GetData1());

diff --git a/xbmc/guiinfo/GUIInfoLabels.h b/xbmc/guiinfo/GUIInfoLabels.h
@@ -557,6 +557,7 @@
 #define WINDOW_PREVIOUS             9997
 #define WINDOW_IS_MEDIA             9998
 #define WINDOW_IS_ACTIVE            9999
+#define WINDOW_IS                   10000
 
 #define CONTROL_GET_LABEL           29996
 #define CONTROL_IS_ENABLED          29997