hello

noppakorn-wai · Jul 8, 2014 · 293acb6 · 293acb6
1 parent 6fde535
commit 293acb6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/Quyd/Quyd/ControlUserProfile.xaml b/Quyd/Quyd/ControlUserProfile.xaml
@@ -12,6 +12,7 @@
 	<Grid x:Name="LayoutRoot">
 		<TextBlock x:Name="usernameBox" HorizontalAlignment="Left" Margin="89,10,0,0" TextWrapping="Wrap" VerticalAlignment="Top" FontSize="32" Foreground="Black" Height="40" Width="127" FontFamily="Tahoma" RenderTransformOrigin="0.496,0.889" Text="ชื่อผู้ใช้"/>
 		<Image x:Name="profilePicture" HorizontalAlignment="Left" Height="84" VerticalAlignment="Top" Width="84" Source="Resources/Images/user1.png" />
+		<local:ControlStar HorizontalAlignment="Left" VerticalAlignment="Top" Margin="89,55,0,0"/>
 
 	</Grid>
 </UserControl>
diff --git a/Quyd/Quyd/PivotPage1.xaml b/Quyd/Quyd/PivotPage1.xaml
@@ -26,11 +26,10 @@
 						<RowDefinition Height="0*"/>
 						<RowDefinition/>
 					</Grid.RowDefinitions>
-					<toolkit:WrapPanel Height="155" Grid.RowSpan="2" VerticalAlignment="Top">
-						<local:ControlUserProfile VerticalAlignment="Top" Margin="10,10,0,0" Height="84" Width="Auto" HorizontalAlignment="Left"/>
-						<local:ControlStar VerticalAlignment="Top" Margin="-124,70,-16,0" Height="24" HorizontalAlignment="Left"/>
-						<local:ControlUserDetail Margin="-124,99,-92,-53" HorizontalAlignment="Left" VerticalAlignment="Top"/>
-					</toolkit:WrapPanel>
+					<StackPanel Orientation="Vertical" Grid.RowSpan="2" VerticalAlignment="Top" Height="160">
+						<local:ControlUserProfile VerticalAlignment="Top" Margin="10,10,10,0" Height="84"/>
+						<local:ControlUserDetail Margin="105,0,10,0" VerticalAlignment="Top"/>
+					</StackPanel>
 					<ScrollViewer Grid.RowSpan="2" Margin="0,160,0,0" Background="#33FFFFFF">
 						<Grid>
 							<local:ControlPost Margin="5,5,5,0" VerticalAlignment="Top" Height="125" Width="Auto"/>
@@ -42,7 +41,15 @@
 			</phone:PivotItem>
 
 			<phone:PivotItem x:Name="Feeds" Header="ข่าว" Margin="0,28,0,0">
-				<Grid Background="#66FFFFFF"/>
+				<ScrollViewer Background="#66FFFFFF">
+					<Grid Height="553" Width="480" HorizontalAlignment="Left" VerticalAlignment="Top">
+						<StackPanel Height="265" VerticalAlignment="Top" Margin="5,5,5,0">
+							<toolkit:WrapPanel Height="210">
+								<local:ControlUserProfile VerticalAlignment="Top" Margin="0,0,23,0"/>
+							</toolkit:WrapPanel>
+						</StackPanel>
+					</Grid>
+				</ScrollViewer>
 			</phone:PivotItem>
 
 			<phone:PivotItem x:Name="Notifications" Header="แจ้งเตือน" Margin="0,28,0,0" Background="Transparent">