Commit Graph

553 Commits

Author SHA1 Message Date
joshaber
449c1e6a69 Merge branch 'master' into dh-async-repo 2016-01-04 11:15:01 -05:00
Kevin J
876928f7f6 Update function documentation for scrollToScreenPosition 2016-01-02 16:05:21 -05:00
Katrina Uychaco
7f57b0ada4 Change event to 'did-terminate-pending-state' 2015-12-24 18:02:07 -08:00
Katrina Uychaco
cca9ea4b60 Rename onDidConfirmPendingState for clarity
Now it is called onDidTerminatePendingState.
2015-12-24 17:56:18 -08:00
Katrina Uychaco
b24250289e Add pending status to text editors
Add event methods for 'did-confirm-pending-state'.
2015-12-24 01:10:42 -08:00
Antonio Scandurra
dfb095b754 🔥 Remove TextEditor.prototype.addBlockDecorationForScreenRow 2015-12-19 13:00:47 +01:00
Antonio Scandurra
8c1f0b0e21 Merge branch 'master' into as-block-decorations
# Conflicts:
#	spec/fake-lines-yardstick.coffee
#	spec/lines-yardstick-spec.coffee
#	spec/text-editor-presenter-spec.coffee
#	src/lines-yardstick.coffee
#	src/text-editor-component.coffee
#	src/text-editor-presenter.coffee
2015-12-18 09:59:12 +01:00
Collin Donahue-Oponski
e4e200317a Autoscroll to cursor after clearing multi-cursor selection. 2015-12-11 15:32:29 -07:00
Collin Donahue-Oponski
4708d5ba88 Merge branch 'master' into colllin-patch-1 2015-12-10 21:03:22 -07:00
joshaber
f3cfb5d069 Merge branch 'master' into dh-async-repo 2015-12-09 15:44:45 -05:00
Antonio Scandurra
afd05f391f Don't prompt to save when a window close is requested
Fixes #942
2015-12-07 14:50:34 +01:00
Antonio Scandurra
b6b2958e67 📝 TextEditor::addBlockDecorationForScreenRow 2015-12-04 15:33:18 +01:00
joshaber
3a06953820 Merge branch 'master' into dh-async-repo 2015-11-30 11:44:20 -05:00
Antonio Scandurra
da1fd69a1f Start implementing BlockDecorationsComponent 2015-11-30 15:48:09 +01:00
Antonio Scandurra
89d9a2ce83 🎨 Create block decorations in TextEditor
This is just an experiment, although I like that we can hide some information
(irrelevant to the user) behind a clean API.
2015-11-26 15:40:08 +01:00
Collin Donahue-Oponski
76947daca4 Merge branch 'colllin-patch-1' of github.com:colllin/atom into colllin-patch-1 2015-11-20 14:13:05 -07:00
Douwe Maan
a9bf2a73a5 Improve TextEditor::getLongTitle 2015-11-17 23:34:31 +01:00
joshaber
41d73db7e5 Merge branch 'master' into dh-async-repo 2015-11-17 11:39:22 -08:00
Collin Donahue-Oponski
538500042c 🐛 Autoscroll to cursor after clearing multi-cursor selection. 2015-11-16 22:05:23 -07:00
Nathan Sobo
af22a149bd Replace getLongTitle with getUniqueTitle 2015-11-16 13:47:23 -08:00
Max Brunsfeld
4c3d355298 👕 Add missing space after comma 2015-11-11 08:44:36 -08:00
Max Brunsfeld
0c72500b9e Set firstVisibleScreenRow property before emitting event 2015-11-10 16:29:39 -08: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
joshaber
bfbbbf16cb Merge branch 'master' into dh-async-repo 2015-11-10 15:23:54 -05:00
Max Brunsfeld
1304648361 Make getLastVisibleScreenRow a model API again 2015-11-09 11:00:38 -08:00
Max Brunsfeld
48cc5e713e Make presenter respond to external changes to model's first visible screen row 2015-11-09 10:13:09 -08:00
Daniel Hengeveld
e2a1337b84 Merge branch 'master' into dh-async-repo 2015-11-09 13:08:23 +01:00
Nathan Sobo
533146bc6a Document new APIs 2015-11-09 00:35:32 -07:00
Nathan Sobo
9714f2e729 Emit decoration events synchronously in legacy spec environment
This is needed to keep a bunch of package tests passing that expect
synchronous decoration updates.
2015-11-09 00:35:31 -07:00
Nathan Sobo
9ee3d53975 Destroy the selections marker layer when editors are destroyed 2015-11-09 00:35:31 -07:00
Nathan Sobo
29bb1bb31b Add TextEditor-level marker layers and use them for selections 2015-11-09 00:35:31 -07:00
Nathan Sobo
1ee6384332 Add TextEditorMarkerLayer 2015-11-09 00:35:31 -07:00
Nathan Sobo
b1a5b58fa2 Rename Marker to TextEditorMarker to resolve ambiguity w/ TextBuffer API
We expose both kinds of markers in Atom, and the docs were actually
wrong when we refer to Markers from TextBuffer because it linked to the
TextEditor layer’s Marker implementation. This will clarify the
difference.
2015-11-09 00:35:30 -07:00
Nathan Sobo
78513f4528 Remove duplicated method definition 2015-11-09 00:35:28 -07:00
Nathan Sobo
a3ff0ad75a 🎨 Rename method 2015-11-09 00:35:28 -07:00
Nathan Sobo
acf142863c Add TextEditor::decorateMarkerLayer 2015-11-09 00:35:27 -07:00
Nathan Sobo
92ed7c8b15 Don’t return Decoration objects from model to view
Preparation for LayerDecorations, in which individual decoration objects
won’t exist for every marker.
2015-11-09 00:35:27 -07:00
Max Brunsfeld
cdaac9dfcc wip 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
Max Brunsfeld
7d46fe6c28 🔥 Unused properties on TextEditor.prototype 2015-11-06 09:56:58 -08:00
joshaber
a8da39b90c Merge branch 'master' into dh-async-repo 2015-11-06 11:43:37 -05:00
abe33
5b192ea295 🎨 Fix typo in moveLineUp comment 2015-11-05 20:36:22 +01:00
abe33
80553028c1 🐛 Fix top of a wrapped line not visible when moving it up 2015-11-04 19:14:44 +01:00
abe33
aa7f87bd62 🐛 Fix auto indent no longer applied when moving lines 2015-11-04 18:56:13 +01:00
Max Brunsfeld
3412251963 Merge pull request #9104 from joseramonc/master
autoindent lines with moveLineUp/moveLineDown
2015-11-03 10:41:29 -08:00
abe33
dacd08badf 🐛 Fix moving multiple selection with folds creates new folds 2015-11-03 00:48:22 +01:00
abe33
668a2dd6cf 🐛 Fix moving a multiple selection with a fold creating new folds 2015-11-02 23:43:43 +01:00
abe33
9d21c773c1 🐛 Fix moving single selection intersecting a fold 2015-11-02 21:46:02 +01:00
abe33
57556ffc42 Merge branch 'master' of github.com:atom/atom into cn-move-lines-up-and-down-with-multiple-selections 2015-11-02 18:39:04 +01:00
Nathan Sobo
152a479909 Merge pull request #9024 2015-11-02 11:26:21 -06:00