Commit Graph

260 Commits

Author SHA1 Message Date
Cheng Zhao
f6e889aeb2 Merge branch 'master' into wl-electron-35 2015-12-11 09:32:32 +08:00
Cheng Zhao
1725b9bf54 Use require('electron') 2015-12-11 09:30:58 +08:00
Nathan Sobo
85c6139579 Don’t force DOM updates in LinesYardstick
Instead, determine the need for a DOM update in the component before
measuring with the lines yardstick, and break `updateSync` into two
explicit pre- and post-measurement phases.
2015-12-10 14:47:05 -07:00
Wliu
fec1507ff4 Require ipc-renderer where it belongs 2015-11-18 21:10:40 -05:00
Wliu
6cd480b37e Fix Electron deprecations 2015-11-17 21:16:09 -05:00
Max Brunsfeld
fefb387d3c Merge branch 'master' into mb-synchronous-scroll-position
Conflicts:
	src/text-editor-presenter.coffee
	src/text-editor.coffee
2015-11-10 16:23:39 -08:00
Nathan Sobo
4b5e4d02eb Use real clock in text-editor-component-spec
This will make it much easier to test asynchronous update logic.
2015-11-09 00:35:18 -07:00
Max Brunsfeld
b58752da38 Keep model's logical scroll position up to date
* Remove scrollRow and scrollColumn properties from the presenter
* Assign presenter's scrollTop and scrollLeft based on model's first visible
  screen row and column, once the presenter has the required measurements.
2015-11-06 11:16:56 -08:00
Antonio Scandurra
40e3b08a8c Add TextEditorElement::getMaxScrollTop 2015-10-20 08:36:27 +02:00
Nathan Sobo
4c51d29868 Merge remote-tracking branch 'origin/master' into ns-alternative-test-env 2015-10-07 16:10:29 -05:00
Nathan Sobo
3636eb35d8 Merge pull request #8811 from atom/as-double-reflow-measurements
DOM-based measurements
2015-10-07 15:43:59 -05:00
Antonio Scandurra
097a035dc4 Don't use atom globals in OverlayManager 2015-10-07 15:25:02 -05:00
Antonio Scandurra
534f038631 Don't use atom globals in TokenIterator 2015-10-07 15:25:02 -05:00
Antonio Scandurra
eba18092fb Don't use atom globals in LinesComponent 2015-10-07 15:25:02 -05:00
Antonio Scandurra
6fed847cce Don't use atom globals in gutter components 2015-10-07 15:25:02 -05:00
Antonio Scandurra
112ee01bd9 Don't use atom globals in TextEditorElement
...except when the element is instantiated via HTML
2015-10-07 15:25:01 -05:00
Antonio Scandurra
8da83022f1 🔥 Remove useless null assignment 2015-10-07 19:51:32 +02:00
Antonio Scandurra
1df9162389 Clear references to scrollbar components 2015-10-07 19:02:45 +02:00
Antonio Scandurra
a62341b548 Avoid capturing this when handling dragging 2015-10-07 19:02:01 +02:00
Antonio Scandurra
581ffb1360 🐎 Avoid to measure invisible lines when dragging 2015-10-05 16:05:17 +02:00
Antonio Scandurra
63ce6cae03 🐛 Fix an issue where yardstick cache wasn't being emptied 2015-10-01 14:20:53 +02:00
Antonio Scandurra
243dea1a1c 🎨 Move pixel-related code to LinesYardstick
* 🔥 Remove useless 'scoped char width' methods
2015-10-01 11:03:25 +02:00
Antonio Scandurra
bb709f58d9 🐎 Cache pixel positions 2015-09-30 16:15:49 +02:00
Antonio Scandurra
698a5ac421 💚 2015-09-29 17:37:43 +02:00
Antonio Scandurra
72093da1a7 🔥 🎉 Remove scoped character width 2015-09-29 17:32:20 +02:00
Antonio Scandurra
123594dbbf Implement ::screenPositionForPixelPosition in LinesYardstick 2015-09-29 17:13:49 +02:00
Antonio Scandurra
40e5f264c5 Pass LinesYardstick to TextEditorPresenter 2015-09-29 11:47:46 +02:00
Antonio Scandurra
49577313e4 Remove yardstick to start with a clean slate 2015-09-29 10:25:54 +02:00
Antonio Scandurra
47b6f043e9 Merge branch 'master' into as-double-reflow-measurements
# Conflicts:
#	src/text-editor-presenter.coffee
2015-09-28 11:19:56 +02:00
Antonio Scandurra
f17767a2bc Merge pull request #8905 from atom/as-display-buffer-logical-coordinates
Use logical coordinates in DisplayBuffer
2015-09-26 18:05:10 +02:00
Antonio Scandurra
051baebd9c Shim ::setHeight and ::getHeight to TextEditorElement 2015-09-25 11:15:41 +02:00
Antonio Scandurra
33a67ad3c9 Shim ::setWidth and ::getWidth to TextEditorElement 2015-09-25 11:05:41 +02:00
Antonio Scandurra
b0d70a63c6 Prevent default event for actions that won't lead to scrolling 2015-09-25 10:55:03 +02:00
Antonio Scandurra
d65b5d1793 Revert "Maintain scroll history"
This reverts commit 2e6bb53303.
2015-09-25 10:31:48 +02:00
Antonio Scandurra
2e6bb53303 Maintain scroll history 2015-09-24 16:25:58 +02:00
Antonio Scandurra
270334b713 Adjust pixelRectForScreenRange to return absolute values 2015-09-24 11:30:46 +02:00
Antonio Scandurra
19ca87f79f 💚 Fix specs 2015-09-24 11:27:54 +02:00
Antonio Scandurra
535a9da946 wip 2015-09-24 11:21:26 +02:00
Antonio Scandurra
a137e50857 Merge pull request #8895 from atom/as-undefined-offset-height
Allow null TextEditorComponent::domNode during visibility check
2015-09-24 10:33:44 +02:00
Antonio Scandurra
3236c8f0f8 Let's start with deprecations! 2015-09-24 10:07:38 +02:00
Antonio Scandurra
c76525fc63 Restore scroll position after we have pixel position requirements 2015-09-24 10:01:11 +02:00
Antonio Scandurra
6673c892d5 Remove references to TextEditor::scroll... 2015-09-24 09:15:10 +02:00
Antonio Scandurra
1f81c633e0 Serialize state using logical coordinates 2015-09-24 09:01:51 +02:00
Antonio Scandurra
4ffeb68403 Ensure domNode is not set arbitrarily to null 2015-09-23 19:01:57 +02:00
Antonio Scandurra
91ef57ed29 Merge branch 'master' into as-display-buffer-logical-coordinates
# Conflicts:
#	src/display-buffer.coffee
2015-09-23 18:46:16 +02:00
Antonio Scandurra
baf27bf99a Preserve un-rounded scroll positions 2015-09-23 17:40:48 +02:00
Antonio Scandurra
7666e4b82e Commit pending positions when a frame is being served 2015-09-23 16:48:00 +02:00
Antonio Scandurra
87c7a0ae30 💚 Fix some TextEditorComponent specs 2015-09-23 16:25:50 +02:00
Antonio Scandurra
57a006d19b Start porting scroll-related specs 2015-09-23 15:34:41 +02:00
Antonio Scandurra
37fb253bfd Prevent default for mousewheel event on mini editors
(ref. 0346e58)
2015-09-23 15:34:27 +02:00