From faa4986ead1faf6638c4fef1e4ed38ea76a187c9 Mon Sep 17 00:00:00 2001 From: Javier Date: Sun, 25 Jan 2015 19:48:58 +0100 Subject: darken colors a bit --- libmdock/mdock-item.c | 4 ++-- libmdock/mdock-widget.c | 6 +++--- test/mdock-standalone.c | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libmdock/mdock-item.c b/libmdock/mdock-item.c index 87a4f49..4ae68f2 100644 --- a/libmdock/mdock-item.c +++ b/libmdock/mdock-item.c @@ -133,8 +133,8 @@ static gboolean mdock_item_expose(GtkWidget *widget, GdkEventExpose *event) if (self->priv->windows) { double circle_radius = self->priv->icon_size / 8.0; cairo_save(cr); - cairo_set_source_rgba(cr, 0.0, 0.0, 0.2, 0.6); - cairo_translate(cr, self->priv->icon_size / 2.0, self->priv->icon_size - circle_radius / 2.0); + cairo_set_source_rgba(cr, 0.4, 0.4, 0.6, 0.8); + cairo_translate(cr, self->priv->icon_size / 2.0, self->priv->icon_size - circle_radius / 2.0 - 1.0); cairo_arc(cr, 0, 0, circle_radius, 0, 2 * M_PI); cairo_fill(cr); cairo_restore(cr); diff --git a/libmdock/mdock-widget.c b/libmdock/mdock-widget.c index 5fc7933..d1b831d 100644 --- a/libmdock/mdock-widget.c +++ b/libmdock/mdock-widget.c @@ -74,7 +74,7 @@ enum { }; static const GtkTargetEntry drag_types[] = { - "application/x-mdock-item", GTK_TARGET_SAME_APP, DRAG_TYPE_ITEM, + "application/x-mdock-item", GTK_TARGET_SAME_WIDGET, DRAG_TYPE_ITEM, "text/uri-list", 0, DRAG_TYPE_URILIST }; @@ -465,9 +465,9 @@ static gboolean handle_item_leave(MDockWidget *self, GdkEventCrossing *event, MD return FALSE; } g_warn_if_fail(!self->priv->current_pointed_item || self->priv->current_pointed_item == item); - g_warn_if_fail(!self->priv->current_popup_item || self->priv->current_pointed_item == item); self->priv->current_pointed_item = NULL; if (self->priv->current_popup_item && !self->priv->popup_timer) { + g_warn_if_fail(!self->priv->current_popup_item || self->priv->current_popup_item == item); self->priv->popup_timer = g_timeout_add(POPUP_HIDE_TIMEOUT, handle_popup_timer, self); } return FALSE; @@ -540,7 +540,7 @@ static void connect_item(MDockWidget *self, MDockItem *item, GSequenceIter *posi g_object_bind_property(self, "orientation", selector, "orientation", - G_BINDING_DEFAULT); + G_BINDING_SYNC_CREATE); g_signal_connect_object(selector, "enter-notify-event", G_CALLBACK(handle_item_selector_enter), self, G_CONNECT_SWAPPED); diff --git a/test/mdock-standalone.c b/test/mdock-standalone.c index af1a3dd..21ac609 100644 --- a/test/mdock-standalone.c +++ b/test/mdock-standalone.c @@ -28,6 +28,7 @@ static void construct_main_window() { mainwin = GTK_WINDOW(gtk_window_new(GTK_WINDOW_TOPLEVEL)); mdock = MDOCK_WIDGET(mdock_widget_new_with_settings_path("/com/javispedro/mdock/standalone/")); + gtk_orientable_set_orientation(GTK_ORIENTABLE(mdock), GTK_ORIENTATION_HORIZONTAL); gtk_container_add(GTK_CONTAINER(mainwin), GTK_WIDGET(mdock)); gtk_window_set_title(mainwin, "MDock standalone"); } -- cgit v1.2.3