DragonX/ObsidianDragon
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

revert(console): drop the redundant jump-to-bottom pill

Browse Source 
renderOutput already draws a clickable "N new lines" jump-to-bottom indicator
(console_tab.cpp ~996), so the pill added earlier duplicated it — and reused the
"console_new_lines" format string incorrectly. Remove the pill and the stray i18n entry;
the existing indicator stands.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
DanS
2026-07-01 16:38:05 -05:00
parent 4ed69d4e9f
commit efec3a50a1
2 changed files with 0 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/ui/windows/console_tab.cpp
View File

@@ -305,44 +305,6 @@ void ConsoleTab::render(ConsoleCommandExecutor& exec)
}
}
// Jump-to-bottom pill — shown at the panel's bottom-right when scrolled up with
// unseen output. Restores the layout cursor after its hit area so the input row
// still flows below the panel.
if (!auto_scroll_ && new_lines_since_scroll_ > 0) {
ImVec2 savedCursor = ImGui::GetCursorScreenPos();
std::string pill = std::to_string(new_lines_since_scroll_) + " " + TR("console_new_lines");
ImFont* pillFont = Type().caption();
ImFont* icoF = Type().iconSmall();
const char* ico = ICON_MD_ARROW_DOWNWARD;
float padX = 10.0f * Layout::hScale();
float padY = 5.0f * Layout::hScale();
ImVec2 tsz = pillFont->CalcTextSizeA(pillFont->LegacySize, FLT_MAX, 0, pill.c_str());
ImVec2 isz = icoF->CalcTextSizeA(icoF->LegacySize, FLT_MAX, 0, ico);
float gap = 4.0f * Layout::hScale();
float pillW = isz.x + gap + tsz.x + padX * 2.0f;
float pillH = std::max(tsz.y, isz.y) + padY * 2.0f;
ImVec2 pMax(outPanelMax.x - 12.0f, outPanelMax.y - 12.0f);
ImVec2 pMin(pMax.x - pillW, pMax.y - pillH);
ImGui::SetCursorScreenPos(pMin);
ImGui::InvisibleButton("##ConsoleJumpBottom", ImVec2(pillW, pillH));
bool hov = ImGui::IsItemHovered();
bool clk = ImGui::IsItemClicked();
dlOut->AddRectFilled(pMin, pMax, WithAlpha(Primary(), hov ? 240 : 205), pillH * 0.5f);
ImU32 fg = IM_COL32(255, 255, 255, 235);
dlOut->AddText(icoF, icoF->LegacySize,
ImVec2(pMin.x + padX, pMin.y + (pillH - isz.y) * 0.5f), fg, ico);
dlOut->AddText(pillFont, pillFont->LegacySize,
ImVec2(pMin.x + padX + isz.x + gap, pMin.y + (pillH - tsz.y) * 0.5f), fg, pill.c_str());
if (hov) ImGui::SetMouseCursor(ImGuiMouseCursor_Hand);
if (clk) {
auto_scroll_ = true;
scroll_to_bottom_ = true;
new_lines_since_scroll_ = 0;
}
ImGui::SetCursorScreenPos(savedCursor);
}
ImGui::Dummy(ImVec2(0, Layout::spacingSm()));
// Input area

1
src/util/i18n.cpp
View File

@@ -982,7 +982,6 @@ void I18n::loadBuiltinEnglish()
strings_["console_help_setgenerate"] = " setgenerate - Control mining";
strings_["console_help_stop"] = " stop - Stop the daemon";
strings_["console_line_count"] = "%zu lines";
strings_["console_new_lines"] = "new";
strings_["console_matches"] = "matches";
strings_["console_new_lines"] = "%d new lines";
strings_["console_no_daemon"] = "No daemon";