redstrate/prism
Archived
1
Fork 0
Code Activity

Change asset browser's column calculation to be more conservative

Browse source
This commit is contained in:
redstrate 2020-08-17 09:27:24 -04:00
parent 66858c687f
commit 86f10f9f2a
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tools/common/src/commoneditor.cpp
View file

@ -284,7 +284,7 @@ void CommonEditor::begin_frame() {
ImGui::SetWindowSize(ImVec2(500, 500)); ImGui::SetWindowSize(ImVec2(500, 500));
ImGui::BeginChild("assetbox", ImVec2(-1, -1), true); ImGui::BeginChild("assetbox", ImVec2(-1, 400), true);
int column = 0; int column = 0;
for(auto& [p, a_type] : asset_files) { for(auto& [p, a_type] : asset_files) {
@ -756,10 +756,15 @@ void CommonEditor::drawAssets() {
if(!filesystem_cached) if(!filesystem_cached)
cacheAssetFilesystem(); cacheAssetFilesystem();
auto window_size = ImGui::GetWindowSize(); const float window_width = ImGui::GetWindowWidth();
const float item_spacing = ImGui::GetStyle().ItemSpacing.x;
const float frame_padding = ImGui::GetStyle().FramePadding.x;
const float window_padding = ImGui::GetStyle().WindowPadding.x;
const int max_columns = (static_cast<int>(window_size.x) % 70) - 2; const float column_width = 64.0f + item_spacing + (frame_padding * 2.0f);
const int max_columns = std::floor((window_width - window_padding) / column_width);
int column = 0; int column = 0;
for(auto& [p, type] : asset_files) { for(auto& [p, type] : asset_files) {
ImGui::PushID(&p); ImGui::PushID(&p);
@ -781,7 +786,7 @@ void CommonEditor::drawAssets() {
column++; column++;
if(column == max_columns) { if(column >= max_columns) {
column = 0; column = 0;
} else { } else {
ImGui::SameLine(); ImGui::SameLine();