Commit Graph

213 Commits

Author SHA1 Message Date
Kevin Sawicki
f778345b3a Add support for requiring a platform-specific stylesheet
Add a getPlatform method to the native object that
is used for requiring the platform stylesheet from
within window.coffee after the atom.css is required.

This is used to provide non-native scrollbars on Linux
for an improved look and feel.
2012-08-22 13:43:46 -07:00
Nathan Sobo
85b6cc3cf5 Make cursor a bit transparent when editor is not focused 2012-08-15 14:54:20 -07:00
Corey Johnson & Nathan Sobo
16b453e2e5 Remove z-index on .lines and .line-number
This was causing AutoComplete to be shown UNDER the lines
2012-08-09 17:22:44 -07:00
Corey Johnson
956cffe225 Add temp styling for folds 2012-08-09 15:18:37 -07:00
Nathan Sobo
34cac4336b Order selection regions behind editor's text
The key here is to force editor's overall z-index to be 0 in order to establish a *local stacking context*. Then we can put the lines at z-index 1 and the selection at z-index -1  within that context without them overlapping elements outside of the editor.
2012-08-08 22:35:57 -06:00
Nathan Sobo
3da19cd93b WIP: Style in a manner compatible w/ TextMate themes 2012-08-08 22:17:00 -06:00
Nathan Sobo
8c5e77d325 Move theme activation to RootView 2012-08-08 17:04:54 -06:00
Nathan Sobo
c8154e4e8c Use Twilight theme stylesheet based on TextMateTheme 2012-08-08 16:55:34 -06:00
Corey Johnson & Nathan Sobo
430fc0eff1 Put a bit more space between editor lines 2012-08-01 17:16:15 -06:00
Nathan Sobo
6de055aa1c Lines aren't taller when they contain an Inconsolata em dash (–) character 2012-08-01 17:04:33 -06:00
Corey Johnson
0c15b0f7be Remove width 100% from .commandPanel (it was not needed and now command panels border is consistent) 2012-07-26 10:19:13 -07:00
Nathan Sobo
454557b502 Merge branch 'master' into global-find
Conflicts:
	spec/extensions/command-panel-spec.coffee
	src/app/buffer.coffee
	src/extensions/command-panel/command-panel.coffee
	src/extensions/command-panel/keymap.coffee
2012-07-24 17:59:49 -06:00
Nathan Sobo
5ebcabb813 Fix preview list cursor styling 2012-07-23 20:14:15 -06:00
Nathan Sobo
07cd01571e Apply some more styling, for better or worse :-) 2012-07-23 20:02:32 -06:00
Nathan Sobo
8f0c8633f8 Move-up / move-down on command panel change the selected operation 2012-07-23 15:01:03 -06:00
Corey Johnson & Nathan Sobo
cc292b604d Select preview item when preview list is shown 2012-07-20 14:19:19 -07:00
Corey Johnson
52d60df272 Stylize command panel preview 2012-07-18 09:22:32 -07:00
Corey Johnson
a5032e3811 PreviewItem displays matched text 2012-07-17 20:12:57 -07:00
Corey Johnson & Nathan Sobo
faea4aedcc Show preview list when X x operation completes 2012-07-17 18:39:29 -06:00
Corey Johnson
e089b74867 Editor.renderedLines' css width is set to 100% when editor.maxScreenLineLength() is less than Editor.scrollView's width 2012-07-16 09:14:33 -07:00
Corey Johnson & Nathan Sobo
d44c648d4b Editor.renderedLines' width is set to the maximum of either Editor.scrollView's width or the maximum rendered line width 2012-07-13 09:05:38 -07:00
Corey Johnson & Nathan Sobo
c39172d625 Change fold colors for twilight theme 2012-07-13 09:04:22 -07:00
Nathan Sobo
3ee7c0dc0f "Scroll" gutter by relatively positioning its line numbers
This matches how we scroll lines, and eliminates opportunities for the gutter to get out of sync with the lines. If that happened, it would probably be a bug, but this at least eliminates one source of confusion when debugging.
2012-07-03 11:09:34 -06:00
Nathan Sobo
4aed73d947 Selections don't absorb click events
Clicking on a selection was causing the click event not to reach the editor, which was causing the editor to lose focus. Using CSS to disallow pointer events on selection region elements fixes this.
2012-06-29 13:34:01 -06:00
Nathan Sobo
5ea1e6f05c Merge remote-tracking branch 'origin/select-from-file-finder'
Conflicts:
	src/extensions/fuzzy-finder.coffee
	static/fuzzy-finder.css
2012-06-29 10:40:34 -06:00
Nathan Sobo
ed48622a3a Rename FileFinder to FuzzyFinder, which will make more sense when we can also use it to fuzzy-find on open buffers 2012-06-28 11:35:30 -06:00
Kevin Sawicki
7b15e18c98 Support clicking on entries in file finder
Add a hover color and register a mousedown listener
that opens the selected path.
2012-06-07 18:33:39 -07:00
Corey Johnson
6952e09646 Moved font-size back to 'px' and fixed specs 2012-06-01 11:06:13 -07:00
Corey Johnson
3c826ec898 Use 'pt' instead of 'px' for font sizes 2012-06-01 11:06:13 -07:00
Corey Johnson
1a9566d954 Merge branch 'master' into binding-viewer 2012-05-31 15:55:23 -07:00
Corey Johnson
130361fc1c Keybinding view is an extension 2012-05-31 15:54:40 -07:00
Nathan Sobo
b1573438a7 Kill inset box-shadow on editor frame because it slows down repaint 2012-05-30 10:51:02 -06:00
Corey Johnson
cbf5c5d16c ctrl-? brings up keybindings for focused view.
it is very ugly.
2012-05-29 17:59:00 -07:00
Nathan Sobo
7c105a0446 Tweak fold line colors
The deselected orange is now a darkened version of the orange used for coffeescript arrows in the twilight theme. The selected color is now a green based on the color of the cursor, to lend a feeling of similarity between the fold line and the cursor.
2012-05-25 12:46:27 -07:00
Corey Johnson & Nathan Sobo
f8c3d89e60 When folds are selected they are highlighted 2012-05-24 16:39:14 -07:00
Corey Johnson & Nathan Sobo
c11ee74405 Remove unused css 2012-05-24 14:08:32 -07:00
Nathan Sobo
527e243d1a Style fold lines a bit 2012-05-21 14:30:35 -07:00
Nathan Sobo
96d92be230 Rename Editor.scrollbar to verticalScrollbar for clarity 2012-05-11 13:45:57 -06:00
Nathan Sobo
b64e9ae10f Rename Editor.scroller to Editor.scrollView to distinguish it from the vertical scrollbar.
Also, base edit session scroll top on the scrollbar instead of the scrollView.
2012-05-11 13:42:57 -06:00
Corey Johnson & Nathan Sobo
c93c63d721 Editor.scroller WheelEvents are forwarded to Editor.scrollbar 2012-05-11 11:04:04 -07:00
Corey Johnson & Nathan Sobo
9427c82084 WIP: Getting specs passing with new stand-in vertical scrollbar 2012-05-11 11:52:03 -06:00
Corey Johnson & Nathan Sobo
1a6ef9d7e2 Revert "Temporarily disable gutter. Add transition affect to margin-top."
This reverts commit 811e5264cf.
2012-05-10 18:00:58 -06:00
Corey Johnson & Nathan Sobo
811e5264cf Temporarily disable gutter. Add transition affect to margin-top. 2012-05-10 17:52:41 -06:00
Corey Johnson & Nathan Sobo
502b463a72 WIP: Adding an artificial scrollbar so we can render content before we scroll. It's blue. 2012-05-10 16:59:46 -06:00
Corey Johnson & Nathan Sobo
d3127a2686 slowed cursor blink down 2012-05-09 12:24:27 -07:00
Nathan Sobo
8b1ac28b89 Editor font sizes can be adjusted with RootView.proto.setFontSize 2012-05-09 08:34:08 -06:00
Nathan Sobo
79315b0ef6 Merge branch 'master' of github.com:github/atom
Conflicts:
	static/command-panel.css
2012-05-08 15:11:27 -06:00
Corey Johnson
77baa7be09 Extract command panel as an extension 2012-05-08 13:49:06 -07:00
Nathan Sobo
a59c96d3a9 Flash red and show an error message when there's an error on moving a file 2012-05-08 14:18:21 -06:00
Nathan Sobo
b528196d1b Refactor AddDialog and MoveDialog into a single Dialog class 2012-05-08 13:16:52 -06:00
Nathan Sobo
eeb28111f3 Double clicking a file changes focus to editor. Double clicking a directory toggles expansion. Single clicking doesn't ever change focus away from tree view. 2012-05-07 14:55:33 -06:00
Nathan Sobo
f41ca1843b Make editor scroller overflow be auto, not scroll 2012-05-07 12:35:25 -06:00
Nathan Sobo
37438c6da8 Status bar path and cursor position updates 2012-05-04 13:58:11 -06:00
Corey Johnson & Nathan Sobo
28ff26e845 Merge branch 'master' into statusbar
Conflicts:
	src/app/editor.coffee
	src/app/project.coffee
	src/app/root-view.coffee
2012-05-04 11:41:13 -06:00
Corey Johnson & Nathan Sobo
5a836f5aaf Tree view resonds to tree-view:add events 2012-04-30 12:04:17 -07:00
Nathan Sobo
18ccee32b8 Add a prompt to the move dialog 2012-04-27 17:27:08 -06:00
Corey Johnson & Nathan Sobo
4ca75b02c5 Move-dialog overlays the bottom of the RootView instead of appearing next to the element 2012-04-27 10:39:55 -06:00
Corey Johnson & Nathan Sobo
d737d97a81 Merge branch 'master' of github.com:github/atom 2012-04-27 10:25:45 -06:00
Corey Johnson & Nathan Sobo
466ad3cfc1 Add #horizontal flexbox container to RootView. TreeView places itself inside it. 2012-04-27 10:24:30 -06:00
Corey Johnson
0a39ca25a9 Pressing 'm' in tree view brings up a move dialog 2012-04-26 17:12:56 -07:00
Nathan Sobo
fd900d5760 TreeView entry selection background is green when TreeView is focused 2012-04-24 13:23:37 -06:00
Nathan Sobo
dd736ddf67 TreeView directories can be selected by clicking them. Start on keyboard nav. 2012-04-24 12:51:01 -06:00
Nathan Sobo
dc8a9f090a When a file is clicked in the tree view, it is opened in the active editor 2012-04-23 17:13:05 -06:00
Nathan Sobo
607dfb4987 Expand/collapse directories when their disclosure arrow is clicked 2012-04-23 15:29:16 -06:00
Nathan Sobo
b23785f28f Display directories first in the tree view. Style file names at same indent as directory names (beyond disclosure arrow) 2012-04-23 15:00:11 -06:00
Nathan Sobo
55c78e9550 Start on TreeView. It renders the entries in the current project's root directory. 2012-04-23 14:20:17 -06:00
Corey Johnson & Nathan Sobo
f652b4e357 Position autocomplete menu above cursor if there isn't room below 2012-04-20 17:18:07 -06:00
Corey Johnson & Nathan Sobo
41a5f217a5 Scroll to selected match when moving up/down in autocomplete menu 2012-04-20 14:55:54 -06:00
Corey Johnson & Nathan Sobo
1a398ffcb9 Use class instead of id for autocomplete 2012-04-20 14:29:00 -06:00
Corey Johnson & Nathan Sobo
9a15f7a02f visual 💄 2012-04-20 11:47:31 -07:00
Nathan Sobo
c0aae15280 Cleanup autocomplete css to accomodate mini-editor 2012-04-19 16:47:04 -06:00
Corey Johnson & Nathan Sobo
038b491247 Add 'mini' option to editor, which styles it with auto-height, no gutter, and overflow hidden on scroller 2012-04-19 16:45:57 -06:00
Corey Johnson
bee683245b move-up, move-down change selection in autocomplete 2012-04-18 10:23:15 -07:00
Corey Johnson
d41ac6626f Autocomplete extends View 2012-04-17 17:37:19 -07:00
Nathan Sobo
77ba75a4c6 Trying to position at the bottom. We need a better flexbox impl 2012-04-17 13:41:31 -06:00
Nathan Sobo
08b661e3bf Fix panes CSS to apply borders to nested rows / columns again 2012-04-12 15:59:55 -06:00
Corey Johnson & Nathan Sobo
416a15e3af Editors in #panes are always contained by .pane wrappers
This prepares us to refactor the split view and editor state code into Column, Row, and Pane objects.
2012-04-11 18:37:22 -06:00
Nathan Sobo
144fb29d83 Make lines have 100% height so the area below last line is clickable 2012-04-11 14:28:26 -06:00
Nathan Sobo
8a4f6510c9 Lighten selections because they're hard to see against darker bg 2012-04-04 11:09:45 -06:00
Nathan Sobo
d521dab2cf Horizontal scrollbar is always visible, and clicking scrollbars doesn't move cursor.
The editor is divided into gutter and scroller. The gutter is scrolled to the correct vertical position whenever the lines are scrolled inside of scroller.
2012-04-03 15:01:28 -06:00
Nathan Sobo
a4c25dc678 Flash red when entering a malformed command in the command panel 2012-03-28 16:11:44 -07:00
Corey Johnson & Nathan Sobo
b2cd059759 Set .hidden-input to fixed position so we don't have to move it when the cursor moves 2012-03-23 10:13:41 -07:00
Nathan Sobo
a91c8098a3 Style the command palette with a ":" before the editor. 2012-03-20 20:35:00 -06:00
Nathan Sobo
e5eedfb7c7 Meta-: toggles the command palette 2012-03-20 19:59:37 -06:00
Nathan Sobo
8ea4b4eb72 File finder opens selected file in the most recent pane.
Only editors inside #root-view #panes are tracked as the most recent active editor. Otherwise the file finder tries to open the selected file in its own mini editor.
2012-03-20 15:51:22 -06:00
Nathan Sobo
c0dd87665a Add a border and subtle inset shadow when panes are split. 2012-03-19 17:01:52 -06:00
Nathan Sobo
81e5a10ddd Perform vim-style editor pane splitting
Using percentage dimensions to absolutely position the panes on screen where they need to be located. Flexbox would have been nice, but unfortunately I could not work around what seem to be bugs (or at least major inconveniences) in its current implementation.
2012-03-19 16:48:13 -06:00
Nathan Sobo
9fab492f66 Fix horizontal split inside top-level vertical split. 2012-03-19 12:37:53 -06:00
Nathan Sobo
29d0e1fe3d Move all screen-splitting-related selectors to atom.css 2012-03-19 12:23:39 -06:00
Nathan Sobo
5b145f64c2 Add vertical splitting. Still some issues with some nested arrangements. 2012-03-19 12:15:37 -06:00
Nathan Sobo
509bac15b6 Cursor is colored / blinks on on focused editor pane 2012-03-19 09:31:03 -06:00
Corey Johnson & Nathan Sobo
2e42df3401 WIP: alt-meta-right splits editor pane to the right 2012-03-19 08:34:37 -06:00
Nathan Sobo
0aeb826bbf Don't display a margin below file-finder list when it's empty 2012-03-16 11:29:48 -06:00
Nathan Sobo
5d1bde62a6 Ensure gutter drop-shadow always extends to bottom of window, even if file is shorter.
This is fragile. Had to apply a min-height of 100% to horizontal scroller. If I apply it to gutter it causes rendering artifacts. I think we're on the edge of the flexbox code here and may even be causing crashes.
2012-03-16 05:49:03 -06:00
Nathan Sobo
174c4e18cc Fix scrolling misbehavior and display artifacts.
Switching back to the new flexbox and re-introducing a scrollable-content node that the flexbox is applied to. This has no height settings so it grows to contains the gutter and lines. The editor outside of it has a width / height of 100% of its container plus overflow-y of scroll. Trying to apply flexbox AND a 100% height + scroll all to the editor causes display artifacts.
2012-03-16 05:41:43 -06:00
Corey Johnson & Nathan Sobo
fd5439f357 Simplify layout and prevent scrollbar flash when toggling file finder. 2012-03-15 17:18:26 -06:00
Nathan Sobo
60056e57fb Use an editor in the file finder instead of an input element. 2012-03-15 13:41:37 -06:00
Nathan Sobo
601cf41108 Fix bug where file-finder pushed editor up.
For now, I'm removing the flexbox treatment of #app-vertical because the file finder just needs to overlay the bottom and absolute positioning is simpler. I'm also using requireStylesheet to load the file finders CSS instead of a link tag.
2012-03-14 18:28:23 -06:00
Nathan Sobo
f02244412f Disable scrolling on the horizontal scroller when soft wrap is on. 2012-03-13 12:13:47 -06:00
Nathan Sobo
6d303aad18 Add a horizontal-scroller to address selection issues when scrolled right
The lines element is now display: table and contained inside of the
scroller. This means the lines element always expands to contain all
lines, which allows absolute positioning inside of it to be relative to
the entire scroll contents, not just to the currently visible area.
2012-03-08 11:23:05 -07:00