s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

layout: Split out choice to a struct on its own

Browse Source
This commit is contained in:
Dorota Czaplejewicz
2020-02-24 13:21:08 +00:00
parent 46cbaf8e87
commit 61e1ab5c5a
8 changed files with 153 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/server-context-service.c
View File

@ -42,13 +42,13 @@ struct _ServerContextService {
EekboardContextService *state; // unowned
/// Needed for instantiating the widget
struct submission *submission; // unowned
struct squeek_layout_state *layout;
gboolean visible;
PhoshLayerSurface *window;
GtkWidget *widget; // nullable
guint hiding;
guint last_requested_height;
enum squeek_arrangement_kind last_type;
};
struct _ServerContextServiceClass {
@ -70,27 +70,6 @@ on_destroy (GtkWidget *widget, gpointer user_data)
//eekboard_context_service_destroy (EEKBOARD_CONTEXT_SERVICE (context));
}
static void
make_widget (ServerContextService *context);
static void
on_notify_keyboard (GObject *object,
GParamSpec *spec,
ServerContextService *context)
{
/* Recreate the keyboard widget to keep in sync with the keymap. */
if (context->window)
make_widget(context);
gboolean visible;
g_object_get (context, "visible", &visible, NULL);
if (visible) {
server_context_service_hide_keyboard(context);
server_context_service_show_keyboard(context);
}
}
static void
on_notify_map (GObject *object,
ServerContextService *context)
@ -119,14 +98,6 @@ calculate_height(int32_t width)
return height;
}
enum squeek_arrangement_kind get_type(uint32_t width, uint32_t height) {
(void)height;
if (width < 540) {
return ARRANGEMENT_KIND_BASE;
}
return ARRANGEMENT_KIND_WIDE;
}
static void
on_surface_configure(PhoshLayerSurface *surface, ServerContextService *context)
{
@ -136,12 +107,6 @@ on_surface_configure(PhoshLayerSurface *surface, ServerContextService *context)
"configured-width", &width,
"configured-height", &height,
NULL);
// check if the change would switch types
enum squeek_arrangement_kind new_type = get_type((uint32_t)width, (uint32_t)height);
if (context->last_type != new_type) {
context->last_type = new_type;
eekboard_context_service_update_layout(context->state, context->last_type);
}
guint desired_height = calculate_height(width);
guint configured_height = (guint)height;
@ -219,14 +184,11 @@ make_widget (ServerContextService *context)
gtk_widget_destroy(context->widget);
context->widget = NULL;
}
LevelKeyboard *keyboard = eekboard_context_service_get_keyboard (context->state);
context->widget = eek_gtk_keyboard_new (keyboard, context->state, context->submission);
context->widget = eek_gtk_keyboard_new (context->state, context->submission, context->layout);
gtk_widget_set_has_tooltip (context->widget, TRUE);
gtk_container_add (GTK_CONTAINER(context->window), context->widget);
gtk_widget_show (context->widget);
gtk_widget_show_all(context->widget);
}
static gboolean
@ -360,19 +322,11 @@ server_context_service_init (ServerContextService *state) {
}
ServerContextService *
server_context_service_new (EekboardContextService *state, struct submission *submission)
server_context_service_new (EekboardContextService *state, struct submission *submission, struct squeek_layout_state *layout)
{
ServerContextService *ui = g_object_new (SERVER_TYPE_CONTEXT_SERVICE, NULL);
ui->submission = submission;
ui->state = state;
g_signal_connect (state,
"notify::keyboard",
G_CALLBACK(on_notify_keyboard),
ui);
ui->layout = layout;
return ui;
}
enum squeek_arrangement_kind server_context_service_get_layout_type(ServerContextService *service)
{
return service->last_type;
}