From 3f451b70099b93ff46d7b91dc4ddfa4541ac8646 Mon Sep 17 00:00:00 2001 From: yuanxing Date: Thu, 28 Jan 2021 10:49:44 +0800 Subject: [PATCH 8/9] fix(theme):adjust the code indent and remove the useless code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 调整代码缩进，并且去掉无用的代码 --- src/themes/kiran/kiran.c | 101 ++++++++++++++++----------------------- 1 file changed, 42 insertions(+), 59 deletions(-) diff --git a/src/themes/kiran/kiran.c b/src/themes/kiran/kiran.c index 165b03c..7858d52 100644 --- a/src/themes/kiran/kiran.c +++ b/src/themes/kiran/kiran.c @@ -127,7 +127,7 @@ destroy_windata(WindowData *windata) /* Draw fuctions */ /* Standard rounded rectangle */ static void -nodoka_rounded_rectangle (cairo_t * cr, +rounded_rectangle (cairo_t * cr, double x, double y, double w, double h, int radius) { @@ -159,7 +159,7 @@ fill_background(GtkWidget *widget, WindowData *windata, cairo_t *cr) cairo_set_source (cr, pattern); cairo_pattern_destroy (pattern); - nodoka_rounded_rectangle (cr, 0, 0, windata->width, + rounded_rectangle (cr, 0, 0, windata->width, windata->height, 8); cairo_fill (cr); @@ -189,7 +189,7 @@ fill_background_when_pointer_enter(GtkWidget *widget, WindowData *windata, cairo cairo_set_source (cr, pattern); cairo_pattern_destroy (pattern); - nodoka_rounded_rectangle (cr, 0, 0, windata->width, + rounded_rectangle (cr, 0, 0, windata->width, windata->height, 8); cairo_fill (cr); @@ -311,8 +311,8 @@ paint_window_when_pointer_enter(GtkWidget *widget, fill_background_when_pointer_enter(widget, windata, cr2); cairo_fill (cr2); - - nodoka_rounded_rectangle (cr2, 0, 0, windata->width , windata->height, 8); + + rounded_rectangle (cr2, 0, 0, windata->width , windata->height, 8); cairo_set_source_rgba (cr2, 40/255.0, 144/255.0, 216/255.0, 1.0); cairo_set_line_width (cr2, 4.0); cairo_stroke (cr2); @@ -340,7 +340,7 @@ static gboolean on_draw (GtkWidget *widget, cairo_t *cr, WindowData *windata) { GtkStateFlags flags = gtk_widget_get_state_flags(windata->win); - if (flags & GTK_STATE_FLAG_PRELIGHT) + if (flags & GTK_STATE_FLAG_PRELIGHT) { paint_window_when_pointer_enter(widget , cr , windata); } @@ -351,19 +351,6 @@ on_draw (GtkWidget *widget, cairo_t *cr, WindowData *windata) return FALSE; } -static gboolean -configure_event_cb(GtkWidget *nw, - GdkEventConfigure *event, - WindowData *windata) -{ - windata->width = event->width; - windata->height = event->height; - - gtk_widget_queue_draw(nw); - - return FALSE; -} - static gboolean countdown_expose_cb(GtkWidget *pie, cairo_t *cr, @@ -387,7 +374,7 @@ countdown_expose_cb(GtkWidget *pie, cairo_translate (cr2, -alloc.x, -alloc.y); GtkStateFlags flags = gtk_widget_get_state_flags(windata->win); - if (flags & GTK_STATE_FLAG_PRELIGHT) + if (flags & GTK_STATE_FLAG_PRELIGHT) { fill_background_when_pointer_enter(pie, windata ,cr2); } @@ -433,44 +420,43 @@ static void on_composited_changed (GtkWidget* window, WindowData* windata) */ GdkFilterReturn event_filter(GdkXEvent *xevent, GdkEvent *event, gpointer userdata) { - XEvent *x_event = (XEvent*)xevent; + XEvent *x_event = (XEvent*)xevent; XGenericEvent *general_event = (XGenericEvent*)x_event; GtkWidget *window = GTK_WIDGET(userdata); - - switch(x_event->type) { - case EnterNotify: - gtk_widget_set_state_flags(window, GTK_STATE_FLAG_PRELIGHT, FALSE); - gtk_widget_queue_draw(window); - break; - case LeaveNotify: - gtk_widget_set_state_flags(window, gtk_widget_get_state_flags(window) & ~GTK_STATE_FLAG_PRELIGHT, TRUE); - gtk_widget_queue_draw(window); - break; - case GenericEvent: - do - { - if (general_event->evtype == EnterNotify) { - gtk_widget_set_state_flags(window, GTK_STATE_FLAG_PRELIGHT, FALSE); - gtk_widget_queue_draw(window); - } - - if (general_event->evtype == LeaveNotify) { - gtk_widget_set_state_flags(window, gtk_widget_get_state_flags(window) & ~GTK_STATE_FLAG_PRELIGHT, TRUE); - gtk_widget_queue_draw(window); - } - }while(0); - break; - default: - break; - } - return GDK_FILTER_CONTINUE; + switch(x_event->type) { + case EnterNotify: + gtk_widget_set_state_flags(window, GTK_STATE_FLAG_PRELIGHT, FALSE); + gtk_widget_queue_draw(window); + break; + case LeaveNotify: + gtk_widget_set_state_flags(window, gtk_widget_get_state_flags(window) & ~GTK_STATE_FLAG_PRELIGHT, TRUE); + gtk_widget_queue_draw(window); + break; + case GenericEvent: + do + { + if (general_event->evtype == EnterNotify) { + gtk_widget_set_state_flags(window, GTK_STATE_FLAG_PRELIGHT, FALSE); + gtk_widget_queue_draw(window); + } + + if (general_event->evtype == LeaveNotify) { + gtk_widget_set_state_flags(window, gtk_widget_get_state_flags(window) & ~GTK_STATE_FLAG_PRELIGHT, TRUE); + gtk_widget_queue_draw(window); + } + }while(0); + break; + default: + break; + } + return GDK_FILTER_CONTINUE; } static void on_realize(GtkWidget *widget , gpointer userdata ) { - GdkWindow *window = gtk_widget_get_window(widget); - gdk_window_add_filter(window, event_filter, widget); + GdkWindow *window = gtk_widget_get_window(widget); + gdk_window_add_filter(window, event_filter, widget); } @@ -513,7 +499,7 @@ get_theme_info(char **theme_name, static void set_css(GtkWidget* widget) { - GtkCssProvider *provider = gtk_css_provider_new (); + GtkCssProvider *provider = gtk_css_provider_new (); gtk_css_provider_load_from_resource (provider, "/kiran/themes/kiran.css"); gtk_style_context_add_provider_for_screen (gtk_widget_get_screen(widget), @@ -579,9 +565,6 @@ create_notification(UrlClickedCb url_clicked) (GDestroyNotify)destroy_windata); atk_object_set_role(gtk_widget_get_accessible(win), ATK_ROLE_ALERT); - g_signal_connect(G_OBJECT(win), "configure_event", - G_CALLBACK(configure_event_cb), windata); - main_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); gtk_widget_set_name(main_vbox , "main_vbox"); gtk_widget_show(main_vbox); @@ -681,7 +664,7 @@ create_notification(UrlClickedCb url_clicked) gtk_label_set_yalign (GTK_LABEL (windata->body_label), 0.0); gtk_label_set_line_wrap(GTK_LABEL(windata->body_label), TRUE); gtk_label_set_line_wrap_mode (GTK_LABEL (windata->body_label), PANGO_WRAP_WORD_CHAR); - gtk_label_set_max_width_chars (GTK_LABEL (windata->body_label), 50); + gtk_label_set_max_width_chars (GTK_LABEL (windata->body_label), 50); gtk_widget_set_vexpand (windata->body_label, TRUE); g_signal_connect(G_OBJECT(windata->body_label), "activate-link", @@ -776,7 +759,7 @@ add_notification_action(GtkWindow *nw, const char *text, const char *key, char *buf; g_assert(windata != NULL); - + if (gtk_widget_get_visible(windata->actions_box)) { gtk_widget_show(windata->actions_box); @@ -870,8 +853,8 @@ move_notification(GtkWidget *nw, int x, int y) { WindowData *windata = g_object_get_data(G_OBJECT(nw), "windata"); g_assert(windata != NULL); - - gtk_window_move(GTK_WINDOW(nw), x, y); + + gtk_window_move(GTK_WINDOW(nw), x, y); } -- 2.27.0