github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-06 03:02:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix editor stats so they look as if they are embedded in the status bar

Browse Source
This commit is contained in:
Justin Palmer
2013-02-01 08:24:43 -08:00
parent 4d8a6e5b60
commit 52c1ca7a2d
2 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/packages/editor-stats/src/editor-stats-view.coffee
View File

@@ -30,7 +30,8 @@ class EditorStatsView extends ScrollView
@instance = new EditorStatsView(rootView, state?.eventLog)
@content: (rootView) ->
@div class: 'editor-stats', tabindex: -1
@div class: 'editor-stats-wrapper', tabindex: -1, =>
@div class: 'editor-stats', outlet: 'editorStats'
@serialize: ->
@instance.serialize()
@@ -42,6 +43,7 @@ class EditorStatsView extends ScrollView
@command 'core:cancel', @detach
@statusBar = @rootView.find '.status-bar'
@css 'background', @statusBar.css('background')
date = new Date(startDate)
future = new Date(date.getTime() + (36e5 * hours))
@@ -54,17 +56,17 @@ class EditorStatsView extends ScrollView
@rootView.on 'mouseup', @track
draw: ->
w = @statusBar.outerWidth()
w = @statusBar.width()
h = @.height()
[pt, pl, pb, pr] = [15,0,0,0]
[pt, pl, pb, pr] = [15,10,0,10]
data = d3.entries @eventLog
x.rangeRoundBands [0, w - pl - pr], 0.2
x.rangeBands [0, w - pl - pr], 0.2
y.range [h, 0]
xaxis.tickSize(-h + pt + pb, 50)
vis = d3.select(@.get(0)).append('svg')
vis = d3.select(@editorStats.get(0)).append('svg')
.attr('width', w)
.attr('height', h)
.append('g')
@@ -75,7 +77,7 @@ class EditorStatsView extends ScrollView
.call(xaxis)
.selectAll('g')
.style('display', (d, i) ->
if i % 15 == 0 || i % 5 == 0
if i % 15 == 0 || i % 5 == 0 || i == data.length - 1
'block'
else
'none'
@@ -85,7 +87,7 @@ class EditorStatsView extends ScrollView
.data(data)
.enter().append('rect')
.attr('x', (d, i) -> x i)
.attr('y', (d) -> y d.value)
.attr('y', (d) -> y(d.value))
.attr('width', x.rangeBand())
.attr('class', 'bar')
@@ -96,8 +98,8 @@ class EditorStatsView extends ScrollView
y.domain [0, max]
bars.data(newdata).transition()
.attr('height', (d, i) -> h - y(d.value))
.attr('y', (d, i) -> y d.value)
.attr('height', (d, i) -> h - y(d.value) - 17)
.attr('y', (d, i) -> y(d.value))
bars.classed('max', (d, i) -> d.value == max)
@@ -117,7 +119,7 @@ class EditorStatsView extends ScrollView
@attach()
attach: ->
@.insertBefore @statusBar
@insertAfter @statusBar
@focus()
@draw()

9
src/packages/editor-stats/stylesheets/editor-stats.css
View File

@@ -1,8 +1,15 @@
.editor-stats-wrapper {
padding: 5px;
box-sizing: border-box;
}
.editor-stats {
height: 50px;
width: 100%;
background: #1d1f21;
border-top: 1px solid rgba(255, 255, 255, 0.1);
border: 1px solid rgba(0, 0, 0, 0.3);
border-bottom: 1px solid rgba(255, 255, 255, 0.1);
border-right: 1px solid rgba(255, 255, 255, 0.1);
}
.editor-stats rect.bar {