Commit 4bbbb219 authored by Alexander Mikhaylenko's avatar Alexander Mikhaylenko

Migrate to libhandy drawer and paginator

parent ca6c27a1
......@@ -119,7 +119,7 @@
</object>
</child>
<child>
<object class="PhoshDrawer" id="drawer">
<object class="HdyDrawer" id="drawer">
<property name="visible">True</property>
<property name="direction">up</property>
<property name="can-hide-overlay">False</property>
......@@ -129,7 +129,7 @@
<property name="orientation">vertical</property>
<child>
<object class="PhoshPaginator" id="apps_paginator">
<object class="HdyPaginator" id="apps_paginator">
<property name="visible">True</property>
<property name="vexpand">True</property>
<property name="spacing">35</property>
......@@ -208,7 +208,7 @@
<class name="app-drawer"/>
</style>
<child>
<object class="PhoshPaginator" id="paginator">
<object class="HdyPaginator" id="paginator">
<property name="visible">True</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
......
......@@ -24,7 +24,7 @@
</child>
<child>
<object class="PhoshDrawer" id="drawer">
<object class="HdyDrawer" id="drawer">
<property name="visible">True</property>
<property name="direction">right</property>
......
......@@ -3,6 +3,11 @@ project('app-drawer', ['c', 'vala'],
meson_version: '>= 0.40.0',
)
add_project_arguments (
'-DHANDY_USE_UNSTABLE_API',
language: 'c'
)
subdir('phosh')
subdir('data')
subdir('src')
......
......@@ -34,6 +34,22 @@
"*.a"
],
"modules": [
{
"name" : "libhandy",
"buildsystem" : "meson",
"config-opts" : [
"-Dtests=false",
"-Dexamples=false",
"-Dglade_catalog=disabled"
],
"sources" : [
{
"type" : "git",
"url" : "https://source.puri.sm/exalm/libhandy.git",
"branch" : "wip/exalm/phosh"
}
]
},
{
"name": "app-drawer",
"builddir": true,
......
......@@ -19,13 +19,15 @@ cc = meson.get_compiler ('c')
app_drawer_deps = [
dependency('gio-2.0', version: '>= 2.50'),
dependency('gtk+-3.0', version: '>= 3.22'),
dependency('libhandy-0.0', version: '>= 0.0.10'),
phosh_dep,
phosh_vapi,
cc.find_library('m', required : false)
]
executable('app-drawer', app_drawer_sources,
vala_args: '--target-glib=2.50', dependencies: app_drawer_deps,
vala_args: '--target-glib=2.50',
dependencies: app_drawer_deps,
install: true,
)
......@@ -9,9 +9,9 @@ public class AppDrawer.AppDrawerWindow : Gtk.ApplicationWindow {
[GtkChild]
private Gtk.Button remove_page_btn_fs;
[GtkChild]
private Phosh.Drawer drawer;
private Hdy.Drawer drawer;
[GtkChild]
private Phosh.Paginator paginator;
private Hdy.Paginator paginator;
[GtkChild]
private Gtk.Frame first_page_bin;
[GtkChild]
......@@ -29,7 +29,7 @@ public class AppDrawer.AppDrawerWindow : Gtk.ApplicationWindow {
[GtkChild]
private Gtk.Box search_view;
[GtkChild]
private Phosh.Paginator apps_paginator;
private Hdy.Paginator apps_paginator;
[GtkChild]
private Phosh.DismissBox dismiss_box;
......
......@@ -7,7 +7,7 @@ public class AppDrawer.SidebarWindow : Gtk.ApplicationWindow {
private const double DIMMING_OPACITY = 0.12;
[GtkChild]
private Phosh.Drawer drawer;
private Hdy.Drawer drawer;
[GtkChild]
private Gtk.ScrolledWindow scrolled_window;
[GtkChild]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment