mirror of
https://github.com/overleaf/overleaf.git
synced 2025-04-26 16:42:09 +00:00
Adapt review panel line height to editor
This commit is contained in:
parent
718f3dc388
commit
bf7038f506
4 changed files with 18 additions and 4 deletions
|
@ -55,6 +55,7 @@ div.full-size(
|
||||||
track-changes-enabled="trackChangesFeatureFlag",
|
track-changes-enabled="trackChangesFeatureFlag",
|
||||||
track-changes= "editor.trackChanges",
|
track-changes= "editor.trackChanges",
|
||||||
doc-id="editor.open_doc_id"
|
doc-id="editor.open_doc_id"
|
||||||
|
renderer-data="reviewPanel.rendererData"
|
||||||
)
|
)
|
||||||
|
|
||||||
include ./review-panel
|
include ./review-panel
|
||||||
|
|
|
@ -57,6 +57,7 @@ define [
|
||||||
trackChanges: "="
|
trackChanges: "="
|
||||||
trackChangesEnabled: "="
|
trackChangesEnabled: "="
|
||||||
docId: "="
|
docId: "="
|
||||||
|
rendererData: "="
|
||||||
}
|
}
|
||||||
link: (scope, element, attrs) ->
|
link: (scope, element, attrs) ->
|
||||||
# Don't freak out if we're already in an apply callback
|
# Don't freak out if we're already in an apply callback
|
||||||
|
@ -318,6 +319,14 @@ define [
|
||||||
doc = session.getDocument()
|
doc = session.getDocument()
|
||||||
doc.off "change", onChange
|
doc.off "change", onChange
|
||||||
|
|
||||||
|
editor.renderer.on "changeCharacterSize", () ->
|
||||||
|
scope.$apply () ->
|
||||||
|
scope.rendererData.lineHeight = editor.renderer.lineHeight
|
||||||
|
|
||||||
|
scope.$watch "rendererData", (rendererData) ->
|
||||||
|
if rendererData?
|
||||||
|
rendererData.lineHeight = editor.renderer.lineHeight
|
||||||
|
|
||||||
template: """
|
template: """
|
||||||
<div class="ace-editor-wrapper">
|
<div class="ace-editor-wrapper">
|
||||||
<div
|
<div
|
||||||
|
|
|
@ -23,6 +23,7 @@ define [
|
||||||
commentThreads: {}
|
commentThreads: {}
|
||||||
resolvedThreadIds: {}
|
resolvedThreadIds: {}
|
||||||
layoutToLeft: false
|
layoutToLeft: false
|
||||||
|
rendererData: {}
|
||||||
|
|
||||||
$scope.$on "layout:pdf:linked", (event, state) ->
|
$scope.$on "layout:pdf:linked", (event, state) ->
|
||||||
$scope.reviewPanel.layoutToLeft = (state.east?.size < 220 || state.east?.initClosed)
|
$scope.reviewPanel.layoutToLeft = (state.east?.size < 220 || state.east?.initClosed)
|
||||||
|
|
|
@ -32,6 +32,8 @@ define [
|
||||||
|
|
||||||
return if entries.length == 0
|
return if entries.length == 0
|
||||||
|
|
||||||
|
line_height = scope.reviewPanel.rendererData.lineHeight
|
||||||
|
|
||||||
focused_entry_index = Math.min(previous_focused_entry_index, entries.length - 1)
|
focused_entry_index = Math.min(previous_focused_entry_index, entries.length - 1)
|
||||||
for entry, i in entries
|
for entry, i in entries
|
||||||
if entry.scope.entry.focused
|
if entry.scope.entry.focused
|
||||||
|
@ -57,15 +59,13 @@ define [
|
||||||
previousMinTop += PADDING + height
|
previousMinTop += PADDING + height
|
||||||
min_tops.reverse()
|
min_tops.reverse()
|
||||||
|
|
||||||
line_height = 15
|
|
||||||
|
|
||||||
positionLayoutEl = ($callout_el, original_top, top) ->
|
positionLayoutEl = ($callout_el, original_top, top) ->
|
||||||
if original_top <= top
|
if original_top <= top
|
||||||
$callout_el.removeClass("rp-entry-callout-inverted")
|
$callout_el.removeClass("rp-entry-callout-inverted")
|
||||||
$callout_el.css(top: original_top + line_height, height: top - original_top)
|
$callout_el.css(top: original_top + line_height - 1, height: top - original_top)
|
||||||
else
|
else
|
||||||
$callout_el.addClass("rp-entry-callout-inverted")
|
$callout_el.addClass("rp-entry-callout-inverted")
|
||||||
$callout_el.css(top: top + line_height + 1, height: original_top - top)
|
$callout_el.css(top: top + line_height, height: original_top - top)
|
||||||
|
|
||||||
# Put the focused entry as close to where it wants to be as possible
|
# Put the focused entry as close to where it wants to be as possible
|
||||||
focused_entry_top = Math.max(previousMinTop, focused_entry.scope.entry.screenPos.y)
|
focused_entry_top = Math.max(previousMinTop, focused_entry.scope.entry.screenPos.y)
|
||||||
|
@ -105,6 +105,9 @@ define [
|
||||||
scope.$applyAsync () ->
|
scope.$applyAsync () ->
|
||||||
layout()
|
layout()
|
||||||
|
|
||||||
|
scope.$watch "reviewPanel.rendererData.lineHeight", () ->
|
||||||
|
layout()
|
||||||
|
|
||||||
## Scroll lock with Ace
|
## Scroll lock with Ace
|
||||||
scroller = element
|
scroller = element
|
||||||
list = element.find(".rp-entry-list-inner")
|
list = element.find(".rp-entry-list-inner")
|
||||||
|
|
Loading…
Add table
Reference in a new issue