ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ui: Keyboard controls (#935)

Browse Source 
* switch focus between views with Tab
* move focus within views with WASD/HJKL/Arrows
* move focus between graph edges by holding Shift
* move focus between code references by holding Shift
* removed graph panning with WASD and moved zooming to Alt + W/S
* removed graph navigation by pressing starting character in graph view lists
* changed local reference and custom trail shortcuts
* updated Keyboard Shortcuts window
* use common back and forward shortcuts and YZ & Shift + YZ
* fix macOS issue where widgets don't get proper focus after creating a new tab
* don't use shared_ptr in QtMainView

fixes #486, #327, #214, #210
This commit is contained in:
Eberhard Gräther
2020-03-02 14:48:03 +01:00
committed by GitHub
parent f4b37f9763
commit b0616778f3
98 changed files with 4204 additions and 863 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_gui/qt/element/code/QtCodeFileSingle.cpp
+39 -4
View File
@@ -169,8 +169,10 @@ void QtCodeFileSingle::scrollTo(
const FilePath& filePath,
size_t lineNumber,
Id locationId,
Id scopeLocationId,
bool animated,
CodeScrollParams::Target target)
CodeScrollParams::Target target,
bool focusTarget)
{
if (m_currentFilePath != filePath)
{
@@ -184,12 +186,15 @@ void QtCodeFileSingle::scrollTo(
animated = false;
}
Id targetLocationId = scopeLocationId ? scopeLocationId : locationId;
size_t endLineNumber = 0;
if (!lineNumber)
{
if (locationId)
if (targetLocationId)
{
std::pair<size_t, size_t> lineNumbers = m_area->getLineNumbersForLocationId(locationId);
std::pair<size_t, size_t> lineNumbers = m_area->getLineNumbersForLocationId(
targetLocationId);
lineNumber = lineNumbers.first;
@@ -208,7 +213,12 @@ void QtCodeFileSingle::scrollTo(
double percentB = endLineNumber ? double(endLineNumber - 1) / m_area->getEndLineNumber() : 0.0f;
ensurePercentVisibleAnimated(percentA, percentB, animated, target);
m_area->ensureLocationIdVisible(locationId, width(), animated);
m_area->ensureLocationIdVisible(targetLocationId, width(), animated);
if (focusTarget && locationId)
{
m_navigator->setFocusedLocationId(m_area, lineNumber, 0, locationId, {}, false);
}
}
void QtCodeFileSingle::onWindowFocus()
@@ -225,6 +235,31 @@ void QtCodeFileSingle::findScreenMatches(
}
}
void QtCodeFileSingle::setFocus(Id locationId)
{
if (m_area)
{
m_area->setFocus(locationId);
}
}
void QtCodeFileSingle::setFocusOnTop()
{
if (m_area)
{
m_area->moveFocusToLine(static_cast<int>(m_area->getStartLineNumber()), 0, false);
}
}
void QtCodeFileSingle::moveFocus(
const CodeFocusHandler::Focus& focus, CodeFocusHandler::Direction direction)
{
if (m_area == focus.area)
{
focus.area->moveFocus(direction, focus.lineNumber, focus.locationId);
}
}
const FilePath& QtCodeFileSingle::getCurrentFilePath() const
{
return m_currentFilePath;