Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'respecttime'

  • Loading branch information...
commit b6c38c1fa2a881ddf3d6c7e437a62aff7765658f 2 parents 9696c8c + a83a0f8
@jschementi authored
View
1  .gitignore
@@ -4,3 +4,4 @@ obj
_ReSharper*
*.user
.svn
+*.sln.docstates
View
8 Schementi.Controls.Demos.Sparkline.Silverlight/MainPage.xaml
@@ -8,7 +8,7 @@
d:DesignHeight="300" d:DesignWidth="400">
<Grid Background="Black" x:Name="LayoutRoot">
- <!--<Grid.RowDefinitions>
+ <Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition Height="3"/>
<RowDefinition/>
@@ -17,10 +17,10 @@
<ColumnDefinition/>
<ColumnDefinition Width="3"/>
<ColumnDefinition/>
- </Grid.ColumnDefinitions>-->
+ </Grid.ColumnDefinitions>
<schementi:Sparkline Margin="0 1"
Foreground="#FFEEEEEE" ShowLatestLevel="True" />
- <!--<schementi:Sparkline Grid.Column="0" Grid.Row="2" Margin="0 2"
+ <schementi:Sparkline Grid.Column="0" Grid.Row="2" Margin="0 2"
Foreground="#FFEEEEEE"
PointFill="White" PointRadius="1"/>
<schementi:Sparkline Grid.Column="2" Grid.Row="0" Margin="0 1"
@@ -32,6 +32,6 @@
Foreground="#FFEEEEEE"
PointFill="White" PointRadius="0.5"/>
<sdk:GridSplitter Grid.Row="1" Grid.ColumnSpan="3" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Height="3"/>
- <sdk:GridSplitter Grid.Column="1" Grid.RowSpan="3" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Width="3"/>-->
+ <sdk:GridSplitter Grid.Column="1" Grid.RowSpan="3" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Width="3"/>
</Grid>
</UserControl>
View
2  Schementi.Controls.Demos.Sparkline/MainPage.xaml.cs
@@ -41,7 +41,7 @@ public partial class MainPage {
for (var i = 0; i < sparklinesCount; i++) {
var random = new Random();
//x = random.Next(100, 200);
- x = x + (random.NextDouble() * 10 * random.NextDouble() * (random.NextDouble() < 0.5 ? -1 : 1));
+ x = x + (random.NextDouble() * 10 * random.NextDouble() * (random.NextDouble() < random.NextDouble() ? -1 : 1));
if (x < 1) x = Math.Abs(x) + 1;
Console.WriteLine(x);
View
6 sparkline.sln
@@ -9,6 +9,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Schementi.Controls.Sparklin
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Schementi.Controls.Demos.Sparkline.Silverlight", "Schementi.Controls.Demos.Sparkline.Silverlight\Schementi.Controls.Demos.Sparkline.Silverlight.csproj", "{CB315EB4-EC0B-4F25-9F2D-361B3878020B}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{46583692-EA37-4E4C-81AF-33784FB46BB5}"
+ ProjectSection(SolutionItems) = preProject
+ LICENSE.txt = LICENSE.txt
+ README.md = README.md
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Please sign in to comment.
Something went wrong with that request. Please try again.