Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Home button and larger buttons in toolbar

Browse source
This commit is contained in:
Paul Rouget 2019-12-04 08:08:08 +01:00
parent 6e3c131139
commit 193113037d
7 changed files with 24 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
support/hololens/ServoApp/Assets/UI/home.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2 KiB

6
support/hololens/ServoApp/BrowserPage.cpp
View file

@ -6,6 +6,7 @@
#include "logs.h" #include "logs.h"
#include "BrowserPage.h" #include "BrowserPage.h"
#include "BrowserPage.g.cpp" #include "BrowserPage.g.cpp"
#include "DefaultUrl.h"
using namespace std::placeholders; using namespace std::placeholders;
using namespace winrt::Windows::Foundation; using namespace winrt::Windows::Foundation;
@ -127,6 +128,11 @@ void BrowserPage::OnStopButtonClicked(IInspectable const &,
servoControl().Stop(); servoControl().Stop();
} }
void BrowserPage::OnHomeButtonClicked(IInspectable const &,
RoutedEventArgs const &) {
servoControl().LoadURIOrSearch(DEFAULT_URL);
}
void BrowserPage::OnURLEdited(IInspectable const &, void BrowserPage::OnURLEdited(IInspectable const &,
Input::KeyRoutedEventArgs const &e) { Input::KeyRoutedEventArgs const &e) {
if (e.Key() == Windows::System::VirtualKey::Enter) { if (e.Key() == Windows::System::VirtualKey::Enter) {

2
support/hololens/ServoApp/BrowserPage.h
View file

@ -25,6 +25,8 @@ public:
Windows::UI::Xaml::RoutedEventArgs const &); Windows::UI::Xaml::RoutedEventArgs const &);
void OnStopButtonClicked(Windows::Foundation::IInspectable const &, void OnStopButtonClicked(Windows::Foundation::IInspectable const &,
Windows::UI::Xaml::RoutedEventArgs const &); Windows::UI::Xaml::RoutedEventArgs const &);
void OnHomeButtonClicked(Windows::Foundation::IInspectable const &,
Windows::UI::Xaml::RoutedEventArgs const &);
void OnURLEdited(Windows::Foundation::IInspectable const &, void OnURLEdited(Windows::Foundation::IInspectable const &,
Windows::UI::Xaml::Input::KeyRoutedEventArgs const &); Windows::UI::Xaml::Input::KeyRoutedEventArgs const &);
void OnURLFocused(Windows::Foundation::IInspectable const &); void OnURLFocused(Windows::Foundation::IInspectable const &);

19
support/hololens/ServoApp/BrowserPage.xaml
View file

@ -14,9 +14,9 @@
<Setter Property="BorderBrush" Value="{ThemeResource ButtonBorderBrush}"/> <Setter Property="BorderBrush" Value="{ThemeResource ButtonBorderBrush}"/>
<Setter Property="BorderThickness" Value="{ThemeResource ButtonBorderThemeThickness}"/> <Setter Property="BorderThickness" Value="{ThemeResource ButtonBorderThemeThickness}"/>
<Setter Property="Padding" Value="0"/> <Setter Property="Padding" Value="0"/>
<Setter Property="Margin" Value="10,2"/> <Setter Property="Margin" Value="5,0"/>
<Setter Property="MinWidth" Value="30"/> <Setter Property="MinWidth" Value="40"/>
<Setter Property="MinHeight" Value="30"/> <Setter Property="MinHeight" Value="40"/>
<Setter Property="HorizontalAlignment" Value="Center"/> <Setter Property="HorizontalAlignment" Value="Center"/>
<Setter Property="VerticalAlignment" Value="Center"/> <Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}"/> <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}"/>
@ -94,31 +94,34 @@
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<StackPanel Orientation="Horizontal" Grid.Column="0"> <StackPanel Orientation="Horizontal" Grid.Column="0">
<Button Style="{StaticResource NavigationBarButton}" x:Name="backButton" IsTabStop="true" IsEnabled="false" Click="OnBackButtonClicked" AutomationProperties.Name="Back" ToolTipService.ToolTip="Back"> <Button Style="{StaticResource NavigationBarButton}" x:Name="backButton" IsTabStop="true" IsEnabled="false" Click="OnBackButtonClicked" AutomationProperties.Name="Back" ToolTipService.ToolTip="Back">
<Image Source="Assets/UI/back.png" Height="12"></Image> <Image Source="Assets/UI/back.png" Height="18"></Image>
<Button.KeyboardAccelerators> <Button.KeyboardAccelerators>
<KeyboardAccelerator Key="Left" Modifiers="Menu" /> <KeyboardAccelerator Key="Left" Modifiers="Menu" />
</Button.KeyboardAccelerators> </Button.KeyboardAccelerators>
</Button> </Button>
<Button Style="{StaticResource NavigationBarButton}" x:Name="forwardButton" IsTabStop="true" IsEnabled="false" Click="OnForwardButtonClicked" AutomationProperties.Name="Forward" ToolTipService.ToolTip="Forward"> <Button Style="{StaticResource NavigationBarButton}" x:Name="forwardButton" IsTabStop="true" IsEnabled="false" Click="OnForwardButtonClicked" AutomationProperties.Name="Forward" ToolTipService.ToolTip="Forward">
<Image Source="Assets/UI/forward.png" Height="12"></Image> <Image Source="Assets/UI/forward.png" Height="18"></Image>
<Button.KeyboardAccelerators> <Button.KeyboardAccelerators>
<KeyboardAccelerator Key="Right" Modifiers="Menu" /> <KeyboardAccelerator Key="Right" Modifiers="Menu" />
</Button.KeyboardAccelerators> </Button.KeyboardAccelerators>
</Button> </Button>
<Button Style="{StaticResource NavigationBarButton}" x:Name="reloadButton" IsTabStop="true" IsEnabled="false" Visibility="Visible" Click="OnReloadButtonClicked" AutomationProperties.Name="Reload" ToolTipService.ToolTip="Reload"> <Button Style="{StaticResource NavigationBarButton}" x:Name="reloadButton" IsTabStop="true" IsEnabled="false" Visibility="Visible" Click="OnReloadButtonClicked" AutomationProperties.Name="Reload" ToolTipService.ToolTip="Reload">
<Image Source="Assets/UI/reload.png" Height="12"></Image> <Image Source="Assets/UI/reload.png" Height="18"></Image>
<Button.KeyboardAccelerators> <Button.KeyboardAccelerators>
<KeyboardAccelerator Key="R" Modifiers="Control" /> <KeyboardAccelerator Key="R" Modifiers="Control" />
</Button.KeyboardAccelerators> </Button.KeyboardAccelerators>
</Button> </Button>
<Button Style="{StaticResource NavigationBarButton}" x:Name="stopButton" IsTabStop="true" IsEnabled="false" Visibility="Collapsed" Click="OnStopButtonClicked" AutomationProperties.Name="Stop" ToolTipService.ToolTip="Stop"> <Button Style="{StaticResource NavigationBarButton}" x:Name="stopButton" IsTabStop="true" IsEnabled="false" Visibility="Collapsed" Click="OnStopButtonClicked" AutomationProperties.Name="Stop" ToolTipService.ToolTip="Stop">
<Image Source="Assets/UI/stop.png" Height="12"></Image> <Image Source="Assets/UI/stop.png" Height="18"></Image>
<Button.KeyboardAccelerators> <Button.KeyboardAccelerators>
<KeyboardAccelerator Key="Escape" Modifiers="None" /> <KeyboardAccelerator Key="Escape" Modifiers="None" />
</Button.KeyboardAccelerators> </Button.KeyboardAccelerators>
</Button> </Button>
<Button Style="{StaticResource NavigationBarButton}" x:Name="homeButton" IsTabStop="true" Click="OnHomeButtonClicked" AutomationProperties.Name="Home" ToolTipService.ToolTip="Home">
<Image Source="Assets/UI/home.png" Height="18"></Image>
</Button>
</StackPanel> </StackPanel>
<TextBox Text="" IsTabStop="true" InputScope="Url" PlaceholderText="Type a URL" x:Name="urlTextbox" Grid.Column="1" KeyUp="OnURLEdited" IsSpellCheckEnabled="False" Margin="3,0" KeyboardAcceleratorPlacementMode="Hidden"> <TextBox Text="" IsTabStop="true" InputScope="Url" PlaceholderText="Type a URL" x:Name="urlTextbox" VerticalAlignment="Center" Grid.Column="1" KeyUp="OnURLEdited" IsSpellCheckEnabled="False" Margin="3,0" KeyboardAcceleratorPlacementMode="Hidden">
<TextBox.KeyboardAccelerators> <TextBox.KeyboardAccelerators>
<KeyboardAccelerator Key="L" Modifiers="Control" Invoked="OnURLKeyboardAccelerator"/> <KeyboardAccelerator Key="L" Modifiers="Control" Invoked="OnURLKeyboardAccelerator"/>
</TextBox.KeyboardAccelerators> </TextBox.KeyboardAccelerators>

2
support/hololens/ServoApp/DefaultUrl.h
View file

@ -1,3 +1,3 @@
#pragma once #pragma once
#define DEFAULT_URL L"https://servo.org/hl-home/"; #define DEFAULT_URL L"https://servo.org/hl-home/"

1
support/hololens/ServoApp/ServoApp.vcxproj
View file

@ -908,6 +908,7 @@
<Image Include="Assets\StoreLogo.scale-400.png" /> <Image Include="Assets\StoreLogo.scale-400.png" />
<Image Include="Assets\UI\back.png" /> <Image Include="Assets\UI\back.png" />
<Image Include="Assets\UI\forward.png" /> <Image Include="Assets\UI\forward.png" />
<Image Include="Assets\UI\home.png" />
<Image Include="Assets\UI\reload.png" /> <Image Include="Assets\UI\reload.png" />
<Image Include="Assets\UI\stop.png" /> <Image Include="Assets\UI\stop.png" />
<Image Include="Assets\Wide310x150Logo.scale-100.png" /> <Image Include="Assets\Wide310x150Logo.scale-100.png" />

3
support/hololens/ServoApp/ServoApp.vcxproj.filters
View file

@ -153,6 +153,9 @@
<Image Include="Assets\UI\stop.png"> <Image Include="Assets\UI\stop.png">
<Filter>Assets\UI</Filter> <Filter>Assets\UI</Filter>
</Image> </Image>
<Image Include="Assets\UI\home.png">
<Filter>Assets\UI</Filter>
</Image>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<AppxManifest Include="Package.appxmanifest" /> <AppxManifest Include="Package.appxmanifest" />