Fixed search bar rendering overflow (Fixes #773)

Author: adriengivry

Sources/OvUI/include/OvUI/Widgets/InputFields/InputText.h

@@ -35,7 +35,6 @@ namespace OvUI::Widgets::InputFields
 		bool focusOnNextDraw = false;
 		bool fullWidth = false;
 		uint32_t iconTextureID = 0;
-		float iconSize = 16.f;
 		OvTools::Eventing::Event<std::string> ContentChangedEvent;
 		OvTools::Eventing::Event<std::string> EnterPressedEvent;
 	};

Sources/OvUI/src/OvUI/Widgets/InputFields/InputText.cpp

@@ -17,45 +17,43 @@ void OvUI::Widgets::InputFields::InputText::_Draw_Impl()
 {
 	std::string previousContent = content;
 
-	if (focusOnNextDraw)
-	{
-		ImGui::SetKeyboardFocusHere();
-		focusOnNextDraw = false;
-	}
+	bool needFocus = focusOnNextDraw;
+	focusOnNextDraw = false;
 
 	const bool hasIcon = iconTextureID != 0;
+	const float buttonSize = ImGui::GetFrameHeight();
+	const float innerSize = buttonSize - 2.0f * ImGui::GetStyle().FramePadding.x;
 
 	if (hasIcon)
 	{
-		const ImVec2 padding = ImGui::GetStyle().FramePadding;
-		ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(padding.x + iconSize + padding.x, padding.y));
+		const ImVec4 frameBg = ImGui::GetStyleColorVec4(ImGuiCol_FrameBg);
+		ImGui::PushStyleColor(ImGuiCol_Button, frameBg);
+		ImGui::PushStyleColor(ImGuiCol_ButtonHovered, frameBg);
+		ImGui::PushStyleColor(ImGuiCol_ButtonActive, frameBg);
+		const bool iconClicked = ImGui::ImageButton(
+			("icon" + m_widgetID).c_str(),
+			(ImTextureID)(uintptr_t)iconTextureID,
+			ImVec2(innerSize, innerSize),
+			ImVec2(0.f, 1.f), ImVec2(1.f, 0.f)
+		);
+		ImGui::PopStyleColor(3);
+
+		if (iconClicked)
+			needFocus = true;
+
+		ImGui::SameLine(0, 0);
 	}
 
 	if (fullWidth)
 		ImGui::SetNextItemWidth(-FLT_MIN);
 
+	if (needFocus)
+		ImGui::SetKeyboardFocusHere(0);
+
 	content.resize(256, '\0');
 	bool enterPressed = ImGui::InputText((label + m_widgetID).c_str(), &content[0], 256, ImGuiInputTextFlags_EnterReturnsTrue | (selectAllOnClick ? ImGuiInputTextFlags_AutoSelectAll : 0));
 	content = content.c_str();
 
-	if (hasIcon)
-	{
-		ImGui::PopStyleVar();
-
-		ImDrawList* drawList = ImGui::GetWindowDrawList();
-		const ImVec2 rectMin = ImGui::GetItemRectMin();
-		const ImVec2 rectMax = ImGui::GetItemRectMax();
-		const float frameHeight = rectMax.y - rectMin.y;
-		const float padding = ImGui::GetStyle().FramePadding.y;
-		const float fitSize = std::min(iconSize, frameHeight - padding * 2.0f);
-		const float centerY = (rectMin.y + rectMax.y) * 0.5f;
-		const float iconX = rectMin.x + ImGui::GetStyle().FramePadding.x;
-		drawList->AddImage(iconTextureID,
-			ImVec2(iconX, centerY - fitSize * 0.5f),
-			ImVec2(iconX + fitSize, centerY + fitSize * 0.5f),
-			ImVec2(0.f, 1.f), ImVec2(1.f, 0.f));
-	}
-
 	if (content != previousContent)
 	{
 		ContentChangedEvent.Invoke(content);