Skip to content

feat(weather editor): add filter options for objects window #1922

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alandtse merged 13 commits into from
Feb 22, 2026
Merged

feat(weather editor): add filter options for objects window #1922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f689249
feat(weather editor): add filter options
Feb 21, 2026
032fe68
style: 🎨 apply pre-commit.ci formatting
pre-commit-ci[bot] Feb 21, 2026
59f9ccb
fix: cleanup
Feb 21, 2026
c97d049
fix: address AI
Feb 21, 2026
2db1598
fix: more AI
Feb 21, 2026
eeb7680
Merge branch 'dev' into improve-objects-window-filter
SkrubbySkrubInAShrub Feb 22, 2026
493716d
refactor: moved functions out of ShowObjectsWindow
Feb 22, 2026
f271a8b
style: 🎨 apply pre-commit.ci formatting
pre-commit-ci[bot] Feb 22, 2026
915cf18
fix: Address AI
Feb 22, 2026
490005a
Merge branch 'improve-objects-window-filter' of https://github.com/Sk…
Feb 22, 2026
4d65fc3
style: 🎨 apply pre-commit.ci formatting
pre-commit-ci[bot] Feb 22, 2026
7225705
fix: address AI
Feb 22, 2026
b76c4b9
style: 🎨 apply pre-commit.ci formatting
pre-commit-ci[bot] Feb 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
195 changes: 137 additions & 58 deletions src/WeatherEditor/EditorWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,17 +150,67 @@ bool IconButton(const char* label, bool filled, const char* iconType)
return result;
}

namespace
{
constexpr const char* kFilterColumnNames[] = { "All", "Editor ID", "Form ID", "File", "Status" };
} // namespace

void EditorWindow::ResetObjectsFilter()
{
m_currentFilterColumn = FilterColumn::All;
m_filterBuffer[0] = '\0';
m_showOnlyFlagged = false;
m_showOnlyFavorites = false;
}

bool EditorWindow::MatchesObjectFilter(Widget* w) const
{
static_assert(static_cast<int>(FilterColumn::Count_) == IM_ARRAYSIZE(kFilterColumnNames),
"kFilterColumnNames must have one entry per FilterColumn value");
if (!w)
return false;
if (m_filterBuffer[0] == '\0')
return true;
switch (m_currentFilterColumn) {
case FilterColumn::EditorID:
return ContainsStringIgnoreCase(w->GetEditorID(), m_filterBuffer);
case FilterColumn::FormID:
return ContainsStringIgnoreCase(w->GetFormID(), m_filterBuffer);
case FilterColumn::File:
return ContainsStringIgnoreCase(w->GetFilename(), m_filterBuffer);
case FilterColumn::Status:
{
auto it = settings.markedRecords.find(w->GetEditorID());
return it != settings.markedRecords.end() && ContainsStringIgnoreCase(it->second, m_filterBuffer);
}
case FilterColumn::All:
default:
{
const auto editorId = w->GetEditorID();
if (ContainsStringIgnoreCase(editorId, m_filterBuffer))
return true;
if (ContainsStringIgnoreCase(w->GetFormID(), m_filterBuffer))
return true;
if (ContainsStringIgnoreCase(w->GetFilename(), m_filterBuffer))
return true;
auto it = settings.markedRecords.find(editorId);
if (it != settings.markedRecords.end() && ContainsStringIgnoreCase(it->second, m_filterBuffer))
return true;
return false;
}
}
}

void EditorWindow::ShowObjectsWindow()
{
ImGui::Begin("Weather and Lighting Browser");

// Static variable to track the selected category
static std::string selectedCategory = "Weather";

// Static variable for filtering objects
static char filterBuffer[256] = "";
static bool showOnlyFlagged = false;
static bool showOnlyFavorites = false;
// Reset filter state when the user switches categories so stale column
// selections (e.g. Status) don't hide all items in the new category.
if (m_selectedCategory != m_previousSelectedCategory) {
ResetObjectsFilter();
m_previousSelectedCategory = m_selectedCategory;
}

// Create a table with two columns
if (ImGui::BeginTable("ObjectTable", 2, ImGuiTableFlags_Resizable | ImGuiTableFlags_BordersInner | ImGuiTableFlags_NoHostExtendX)) {
Expand All @@ -183,8 +233,8 @@ void EditorWindow::ShowObjectsWindow()
const char* categories[] = { "Weather", "ImageSpace", "Lighting Template", "Cell Lighting", "Volumetric Lighting", "Shader Particle Geometry", "Lens Flare", "Visual Effect", "Interior Only" };
for (int i = 0; i < IM_ARRAYSIZE(categories); ++i) {
// Highlight the selected category
if (ImGui::Selectable(categories[i], selectedCategory == categories[i])) {
selectedCategory = categories[i]; // Update selected category
if (ImGui::Selectable(categories[i], m_selectedCategory == categories[i])) {
m_selectedCategory = categories[i]; // Update selected category
}
}
ImGui::EndListBox();
Expand All @@ -197,7 +247,7 @@ void EditorWindow::ShowObjectsWindow()

if (ImGui::BeginChild("##ObjectsContent", { 0, 0 }, ImGuiChildFlags_Border)) {
// Interior Only category has its own panel
if (selectedCategory == "Interior Only") {
if (m_selectedCategory == "Interior Only") {
InteriorOnlyPanel::Draw();
ImGui::EndChild();
ImGui::EndTable();
Expand Down Expand Up @@ -238,32 +288,78 @@ void EditorWindow::ShowObjectsWindow()
ImGui::SetKeyboardFocusHere();
}
}
ImGui::InputTextWithHint("##ObjectFilter", "Filter... (Ctrl+F)", filterBuffer, sizeof(filterBuffer));
// Compute fixed widths once; reuse for both the search bar and the following combo.
const auto& style = ImGui::GetStyle();
// comboW = preview text + left/right padding + arrow button
const float comboW = ImGui::CalcTextSize("Editor ID").x + style.FramePadding.x * 2.0f + ImGui::GetFrameHeight();
const float helpW = ImGui::CalcTextSize("(?)").x;
const float iconW = ImGui::GetFrameHeight();
// Fixed width is the sum of every item that follows the search bar on the same row.
// Each SameLine() contributes style.ItemSpacing.x; widths are listed explicitly
// so adding or removing a widget only requires updating its own expression.
const float fixedW =
style.ItemSpacing.x + comboW + // combo
style.ItemSpacing.x + helpW + // help marker
style.ItemSpacing.x + 10.0f + // spacer before favorites
style.ItemSpacing.x + iconW + // fav icon
style.ItemSpacing.x + ImGui::CalcTextSize("Favorites").x + // "Favorites" label
style.ItemSpacing.x + 10.0f + // spacer before flagged
style.ItemSpacing.x + iconW + // flag icon
style.ItemSpacing.x + ImGui::CalcTextSize("Flagged").x; // "Flagged" label
ImGui::SetNextItemWidth(std::max(50.0f, ImGui::GetContentRegionAvail().x - fixedW));
ImGui::InputTextWithHint("##ObjectFilter", "Filter... (Ctrl+F)", m_filterBuffer, sizeof(m_filterBuffer));

ImGui::SameLine();
HelpMarker("Type a part of an object name to filter the list.\nCtrl+F: Focus search\nEnter: Open selected");
ImGui::SetNextItemWidth(comboW);
int col = static_cast<int>(m_currentFilterColumn);
if (ImGui::Combo("##FilterBy", &col, kFilterColumnNames, IM_ARRAYSIZE(kFilterColumnNames)))
m_currentFilterColumn = static_cast<FilterColumn>(col);

ImGui::SameLine();
HelpMarker("Filter the object list by the selected column.\nAll: searches Editor ID, Form ID, File, and Status.\nStatus: hides items with no status marker when the search box is non-empty.\nCtrl+F: Focus search\nEnter: Open selected");

// Quick filter buttons on same row
ImGui::SameLine();
ImGui::Dummy(ImVec2(10.0f, 0.0f)); // Spacer
ImGui::SameLine();
if (IconButton("##filterFavorites", showOnlyFavorites, "star")) {
showOnlyFavorites = !showOnlyFavorites;
if (IconButton("##filterFavorites", m_showOnlyFavorites, "star")) {
m_showOnlyFavorites = !m_showOnlyFavorites;
}
ImGui::SameLine();
ImGui::Text("Favorites");

ImGui::SameLine();
ImGui::Dummy(ImVec2(10.0f, 0.0f)); // Spacer
ImGui::SameLine();
if (IconButton("##filterFlagged", showOnlyFlagged, "circle")) {
showOnlyFlagged = !showOnlyFlagged;
if (IconButton("##filterFlagged", m_showOnlyFlagged, "circle")) {
m_showOnlyFlagged = !m_showOnlyFlagged;
}
ImGui::SameLine();
ImGui::Text("Flagged");

// Returns the widget collection for a given category; Cell Lighting and unknown
// categories return an empty collection since they have no standalone widget list.
auto getWidgetsForCategory = [&](const std::string& cat) -> const std::vector<std::unique_ptr<Widget>>& {
static const std::vector<std::unique_ptr<Widget>> emptyWidgets;
if (cat == "Weather")
return weatherWidgets;
if (cat == "Lighting Template")
return lightingTemplateWidgets;
if (cat == "ImageSpace")
return imageSpaceWidgets;
if (cat == "Volumetric Lighting")
return volumetricLightingWidgets;
if (cat == "Shader Particle Geometry")
return precipitationWidgets;
if (cat == "Lens Flare")
return lensFlareWidgets;
if (cat == "Visual Effect")
return referenceEffectWidgets;
return emptyWidgets;
};

// Show recent widgets section for current category
auto recentIt = settings.recentWidgets.find(selectedCategory);
auto recentIt = settings.recentWidgets.find(m_selectedCategory);
if (recentIt != settings.recentWidgets.end() && !recentIt->second.empty()) {
ImGui::Spacing();
ImGui::TextColored(Menu::GetSingleton()->GetTheme().StatusPalette.InfoColor, "Recent:");
Expand All @@ -273,15 +369,7 @@ void EditorWindow::ShowObjectsWindow()
ImGui::SameLine();
if (ImGui::SmallButton(recentIt->second[i].c_str())) {
// Find and open widget in current category's collection
auto& widgets = selectedCategory == "Weather" ? weatherWidgets :
selectedCategory == "Lighting Template" ? lightingTemplateWidgets :
selectedCategory == "ImageSpace" ? imageSpaceWidgets :
selectedCategory == "Volumetric Lighting" ? volumetricLightingWidgets :
selectedCategory == "Shader Particle Geometry" ? precipitationWidgets :
selectedCategory == "Lens Flare" ? lensFlareWidgets :
selectedCategory == "Visual Effect" ? referenceEffectWidgets :
weatherWidgets;

const auto& widgets = getWidgetsForCategory(m_selectedCategory);
for (auto& widget : widgets) {
if (widget->GetEditorID() == recentIt->second[i]) {
widget->SetOpen(true);
Expand Down Expand Up @@ -348,15 +436,7 @@ void EditorWindow::ShowObjectsWindow()
}

// Display objects based on the selected category
std::vector<std::unique_ptr<Widget>> emptyWidgets;
const auto& widgets = selectedCategory == "Weather" ? weatherWidgets :
selectedCategory == "Cell Lighting" ? emptyWidgets :
selectedCategory == "ImageSpace" ? imageSpaceWidgets :
selectedCategory == "Volumetric Lighting" ? volumetricLightingWidgets :
selectedCategory == "Shader Particle Geometry" ? precipitationWidgets :
selectedCategory == "Lens Flare" ? lensFlareWidgets :
selectedCategory == "Visual Effect" ? referenceEffectWidgets :
lightingTemplateWidgets;
const auto& widgets = getWidgetsForCategory(m_selectedCategory);
// Sort widgets based on current sort column
std::vector<Widget*> sortedWidgets;
sortedWidgets.reserve(widgets.size());
Expand Down Expand Up @@ -422,7 +502,7 @@ void EditorWindow::ShowObjectsWindow()
};

// Special handling for Cell Lighting category
if (selectedCategory == "Cell Lighting") {
if (m_selectedCategory == "Cell Lighting") {
auto player = RE::PlayerCharacter::GetSingleton();
if (player && player->parentCell) {
auto cell = player->parentCell;
Expand Down Expand Up @@ -504,28 +584,33 @@ void EditorWindow::ShowObjectsWindow()

// Get current cell's lighting template for prioritization
RE::BGSLightingTemplate* currentCellLightingTemplate = nullptr;
if (selectedCategory == "Lighting Template") {
if (m_selectedCategory == "Lighting Template") {
auto player = RE::PlayerCharacter::GetSingleton();
if (player && player->parentCell) {
auto& cellData = player->parentCell->GetRuntimeData();
currentCellLightingTemplate = cellData.lightingTemplate;
}
}

// Centralized filter check used by both display loops below.
auto shouldShowWidget = [&](Widget* w) {
if (!MatchesObjectFilter(w))
return false;
if (m_showOnlyFavorites && !IsFavorite(w->GetEditorID()))
return false;
if (m_showOnlyFlagged && settings.markedRecords.find(w->GetEditorID()) == settings.markedRecords.end())
return false;
return true;
};

// Filtered display of widgets - show current cell's lighting template first
if (currentCellLightingTemplate && selectedCategory == "Lighting Template") {
if (currentCellLightingTemplate && m_selectedCategory == "Lighting Template") {
for (int i = 0; i < sortedWidgets.size(); ++i) {
auto* ltWidget = dynamic_cast<LightingTemplateWidget*>(sortedWidgets[i]);
if (!ltWidget || ltWidget->lightingTemplate != currentCellLightingTemplate)
continue;

if (!ContainsStringIgnoreCase(sortedWidgets[i]->GetEditorID(), filterBuffer))
continue;

// Apply quick filters
if (showOnlyFavorites && !IsFavorite(sortedWidgets[i]->GetEditorID()))
continue;
if (showOnlyFlagged && settings.markedRecords.find(sortedWidgets[i]->GetEditorID()) == settings.markedRecords.end())
if (!shouldShowWidget(sortedWidgets[i]))
continue;

auto editorLabel = std::format("[CURRENT] {}", sortedWidgets[i]->GetEditorID());
Expand All @@ -552,14 +637,14 @@ void EditorWindow::ShowObjectsWindow()
if (ImGui::Selectable(editorLabel.c_str(), isSelected, ImGuiSelectableFlags_SpanAllColumns | ImGuiSelectableFlags_AllowDoubleClick | ImGuiSelectableFlags_AllowOverlap)) {
if (ImGui::IsMouseDoubleClicked(0)) {
sortedWidgets[i]->SetOpen(true);
AddToRecent(sortedWidgets[i]->GetEditorID(), selectedCategory);
AddToRecent(sortedWidgets[i]->GetEditorID(), m_selectedCategory);
}
}

// Enter key to open
if (isSelected && ImGui::IsKeyPressed(ImGuiKey_Enter)) {
sortedWidgets[i]->SetOpen(true);
AddToRecent(sortedWidgets[i]->GetEditorID(), selectedCategory);
AddToRecent(sortedWidgets[i]->GetEditorID(), m_selectedCategory);
}

// Context menu
Expand Down Expand Up @@ -603,19 +688,13 @@ void EditorWindow::ShowObjectsWindow()
// Filtered display of widgets - regular list
for (int i = 0; i < sortedWidgets.size(); ++i) {
// Skip current cell's lighting template if already shown
if (currentCellLightingTemplate && selectedCategory == "Lighting Template") {
if (currentCellLightingTemplate && m_selectedCategory == "Lighting Template") {
auto* ltWidget = dynamic_cast<LightingTemplateWidget*>(sortedWidgets[i]);
if (ltWidget && ltWidget->lightingTemplate == currentCellLightingTemplate)
continue;
}

if (!ContainsStringIgnoreCase(sortedWidgets[i]->GetEditorID(), filterBuffer))
continue;

// Apply quick filters
if (showOnlyFavorites && !IsFavorite(sortedWidgets[i]->GetEditorID()))
continue;
if (showOnlyFlagged && settings.markedRecords.find(sortedWidgets[i]->GetEditorID()) == settings.markedRecords.end())
if (!shouldShowWidget(sortedWidgets[i]))
continue;

auto editorLabel = sortedWidgets[i]->GetEditorID();
Expand Down Expand Up @@ -643,12 +722,12 @@ void EditorWindow::ShowObjectsWindow()
if (ImGui::Selectable(editorLabel.c_str(), isSelected, ImGuiSelectableFlags_SpanAllColumns | ImGuiSelectableFlags_AllowDoubleClick | ImGuiSelectableFlags_AllowOverlap)) {
if (ImGui::IsMouseDoubleClicked(0)) {
sortedWidgets[i]->SetOpen(true);
AddToRecent(sortedWidgets[i]->GetEditorID(), selectedCategory);
AddToRecent(sortedWidgets[i]->GetEditorID(), m_selectedCategory);
}
}

// Show ImageSpace and VolumetricLighting info for weather widgets
if (selectedCategory == "Weather" && ImGui::IsItemHovered()) {
if (m_selectedCategory == "Weather" && ImGui::IsItemHovered()) {
auto* weatherWidget = dynamic_cast<WeatherWidget*>(sortedWidgets[i]);
if (weatherWidget && weatherWidget->weather) {
ImGui::BeginTooltip();
Expand Down Expand Up @@ -680,7 +759,7 @@ void EditorWindow::ShowObjectsWindow()
// Enter key to open
if (isSelected && ImGui::IsKeyPressed(ImGuiKey_Enter)) {
sortedWidgets[i]->SetOpen(true);
AddToRecent(sortedWidgets[i]->GetEditorID(), selectedCategory);
AddToRecent(sortedWidgets[i]->GetEditorID(), m_selectedCategory);
}

// Opens a context menu on right click to mark records by color
Expand Down
19 changes: 19 additions & 0 deletions src/WeatherEditor/EditorWindow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,4 +226,23 @@ class EditorWindow
void RefreshJsonAttachmentCache(const std::vector<Widget*>& widgets);
bool HasCachedJsonAttachment(Widget* widget) const;
void InvalidateJsonAttachmentCache(Widget* widget = nullptr);

// Objects window filter state
enum class FilterColumn : int
{
All = 0,
EditorID,
FormID,
File,
Status,
Count_ // Sentinel – must equal IM_ARRAYSIZE(kFilterColumnNames)
};
std::string m_selectedCategory = "Weather";
std::string m_previousSelectedCategory = "Weather";
char m_filterBuffer[256] = {};
bool m_showOnlyFlagged = false;
bool m_showOnlyFavorites = false;
FilterColumn m_currentFilterColumn = FilterColumn::All;
void ResetObjectsFilter();
bool MatchesObjectFilter(Widget* w) const;
};