Merge pull request #313 from lonemadmax/tooltips

Small editor tooltips tweaks
Genio-The-Haiku-IDE · Feb 11, 2024 · 8a99dbc · 8a99dbc
2 parents 8d5ece8 + 6a79593
commit 8a99dbc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/helpers/tabview/TabManager.cpp b/src/helpers/tabview/TabManager.cpp
@@ -385,8 +385,6 @@ class TabManagerController : public TabContainerView::Controller {
 			return;
 		fCurrentToolTip = toolTipText;
 		fManager->GetTabContainerView()->HideToolTip();
-		fManager->GetTabContainerView()->SetToolTip(
-			reinterpret_cast<BToolTip*>(NULL));
 		fManager->GetTabContainerView()->SetToolTip(fCurrentToolTip.String());
 	}
 

diff --git a/src/lsp-client/LSPEditorWrapper.cpp b/src/lsp-client/LSPEditorWrapper.cpp
@@ -275,13 +275,13 @@ LSPEditorWrapper::DiagnosticFromPosition(Sci_Position sci_position, LSPDiagnosti
 	if (fEditor->SendMessage(SCI_INDICATORVALUEAT, IND_DIAG, sci_position) == 1) {
 		for (auto& ir : fLastDiagnostics) {
 			index++;
-			if (sci_position > ir.range.from && sci_position <= ir.range.to) {
+			if (sci_position >= ir.range.from && sci_position < ir.range.to) {
 				dia = ir;
 				return index;
 			}
 		}
 	}
-	return index;
+	return -1;
 }
 
 

diff --git a/src/ui/EditorTabManager.cpp b/src/ui/EditorTabManager.cpp
@@ -87,9 +87,12 @@ EditorTabManager::GetToolTipText(int32 index)
 	BString label("");
 	Editor* editor = EditorAt(index);
 	if (editor) {
-		label << editor->Name();
+		label << editor->FilePath();
 		ProjectFolder* project = editor->GetProjectFolder();
 		if (project) {
+			if (label.StartsWith(project->Path()))
+				label.Remove(0, project->Path().Length() + 1);
+					// Length + 1 to also remove the path separator
 			label << "\n" << B_TRANSLATE("Project") << ": " << project->Name();
 			if (project->Active())
 				label << " (" << B_TRANSLATE("Active") << ")";