Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Matt Blaha
Highscore
Commits
23ec9ed0
Commit
23ec9ed0
authored
Aug 12, 2017
by
Abhinav Singh
Browse files
ui: Display ControllerPopover in DisplayHeaderBar
https://bugzilla.gnome.org/show_bug.cgi?id=780756
parent
af9c4513
Changes
3
Hide whitespace changes
Inline
Side-by-side
data/ui/display-header-bar.ui
View file @
23ec9ed0
...
...
@@ -92,5 +92,30 @@
<property
name=
"pack-type"
>
end
</property>
</packing>
</child>
<child>
<object
class=
"GtkMenuButton"
id=
"controller_button"
>
<property
name=
"visible"
>
True
</property>
<property
name=
"valign"
>
center
</property>
<property
name=
"use-underline"
>
True
</property>
<style>
<class
name=
"image-button"
/>
</style>
<child
internal-child=
"accessible"
>
<object
class=
"AtkObject"
id=
"a11y-controller"
>
<property
name=
"accessible-name"
translatable=
"yes"
>
controller
</property>
</object>
</child>
<child>
<object
class=
"GtkImage"
id=
"controller_image"
>
<property
name=
"visible"
>
True
</property>
<property
name=
"icon-name"
>
input-gaming-symbolic
</property>
<property
name=
"icon-size"
>
1
</property>
</object>
</child>
</object>
<packing>
<property
name=
"pack-type"
>
end
</property>
</packing>
</child>
</template>
</interface>
src/ui/application-window.vala
View file @
23ec9ed0
...
...
@@ -254,6 +254,8 @@ private class Games.ApplicationWindow : Gtk.ApplicationWindow {
display_box
.
runner
=
runner
;
display_header_bar
.
media_set
=
runner
.
media_set
;
display_box
.
header_bar
.
media_set
=
runner
.
media_set
;
display_header_bar
.
controller_set
=
runner
.
controller_set
;
display_box
.
header_bar
.
controller_set
=
runner
.
controller_set
;
is_fullscreen
=
settings
.
get_boolean
(
"fullscreen"
)
&&
runner
.
can_fullscreen
;
...
...
src/ui/display-header-bar.vala
View file @
23ec9ed0
...
...
@@ -6,6 +6,8 @@ private class Games.DisplayHeaderBar : Gtk.HeaderBar {
[
GtkChild
]
private
MediaMenuButton
media_button
;
[
GtkChild
]
private
Gtk
.
MenuButton
controller_button
;
public
string
game_title
{
set
{
title
=
value
;
}
...
...
@@ -21,7 +23,15 @@ private class Games.DisplayHeaderBar : Gtk.HeaderBar {
}
}
public
ControllerSet
?
controller_set
{
set
{
controller_popover
.
controller_set
=
value
;
controller_button
.
visible
=
value
!=
null
;
}
}
private
MediaSelector
media_selector
;
private
ControllerPopover
controller_popover
;
[
GtkChild
]
private
Gtk
.
Button
fullscreen
;
...
...
@@ -34,6 +44,10 @@ private class Games.DisplayHeaderBar : Gtk.HeaderBar {
construct
{
settings
=
new
Settings
(
"org.gnome.Games"
);
controller_popover
=
new
ControllerPopover
();
controller_popover
.
set_relative_to
(
controller_button
);
controller_button
.
set_popover
(
controller_popover
);
media_selector
=
new
MediaSelector
();
media_selector
.
set_relative_to
(
media_button
);
media_button
.
set_popover
(
media_selector
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment