#4764: Experimentally place a popup containing the thumbnails next to…

… the media browser
codereader · Nov 6, 2022 · 7555819 · 7555819
1 parent 8b6c608
commit 7555819
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 1 deletion.
diff --git a/radiant/ui/mediabrowser/MediaBrowser.cpp b/radiant/ui/mediabrowser/MediaBrowser.cpp
@@ -1,5 +1,7 @@
 #include "MediaBrowser.h"
 
+#include <wx/display.h>
+
 #include "ideclmanager.h"
 #include "imap.h"
 #include "ishaders.h"
@@ -8,13 +10,15 @@
 #include "wxutil/dataview/ResourceTreeViewToolbar.h"
 
 #include <wx/sizer.h>
+#include <wx/popupwin.h>
 
 #include "util/ScopedBoolLock.h"
 #include "ui/texturebrowser/TextureBrowserManager.h"
 #include "ui/common/TexturePreviewCombo.h"
 
 #include "FocusMaterialRequest.h"
 #include "ui/UserInterfaceModule.h"
+#include "ui/texturebrowser/TextureDirectoryBrowser.h"
 
 namespace ui
 {
@@ -190,6 +194,35 @@ void MediaBrowser::_onTreeViewSelectionChanged(wxDataViewEvent& ev)
     else
     {
         _preview->ClearPreview();
+
+        // When a directory is selected, open the popup
+        auto popup = new wxPopupTransientWindow(this);
+
+        popup->SetSizer(new wxBoxSizer(wxVERTICAL));
+
+        auto browser = new TextureDirectoryBrowser(popup, _treeView->GetSelectedFullname());
+        //browser->SetMinSize(size);
+
+        wxPoint posScreen;
+        wxSize sizeScreen;
+
+        const int displayNum = wxDisplay::GetFromPoint(GetScreenPosition());
+        if ( displayNum != wxNOT_FOUND )
+        {
+            wxRect rectScreen = wxDisplay(displayNum).GetGeometry();
+            posScreen = rectScreen.GetPosition();
+            sizeScreen = rectScreen.GetSize();
+        }
+
+        // From the upper edge of the mediabrowser to the bottom of the screen (minus a few pixels)
+        wxSize size(600, (posScreen.y + sizeScreen.y) - GetScreenPosition().y - 40);
+
+        popup->GetSizer()->Add(browser, 1, wxEXPAND);
+        popup->SetPosition(this->GetScreenRect().GetRightTop());
+        popup->SetSize(size);
+        popup->Layout();
+        //popup->Position(this->GetScreenRect().GetRightTop(), size);
+        popup->Popup();
     }
 
     sendSelectionToShaderClipboard();

diff --git a/radiant/ui/texturebrowser/TextureDirectoryBrowser.h b/radiant/ui/texturebrowser/TextureDirectoryBrowser.h
@@ -2,6 +2,7 @@
 
 #include "ishaders.h"
 #include "TextureThumbnailBrowser.h"
+#include "os/path.h"
 
 namespace ui
 {
@@ -18,7 +19,7 @@ class TextureDirectoryBrowser :
 public:
     TextureDirectoryBrowser(wxWindow* parent, const std::string& texturePath) :
         TextureThumbnailBrowser(parent),
-        _texturePath(texturePath)
+        _texturePath(os::standardPathWithSlash(texturePath))
     {}
 
 protected:
@@ -29,6 +30,10 @@ class TextureDirectoryBrowser :
             // Check if this material is matching the prefix
             if (!string::istarts_with(name, _texturePath)) return;
 
+            // Ignore any subdirectories, just direct leafs
+            auto partAfterPrefix = name.substr(_texturePath.length());
+            if (partAfterPrefix.find('/') != std::string::npos) return;
+
             createTileForMaterial(GlobalMaterialManager().getMaterial(name));
         });
     }