Skip to content

Commit 4f63d2c

Browse files
TomaszGasiorclefebvre
authored andcommitted
Better appearance (#234)
* EvPageActionWidget: don't use vertical margin Don't set vertical margin for this widget. Margin makes toolbar bigger than should be, defined by theme. * Update shell CSS styles To make it working. * EvSidebar*, EvWindow: avoid useless shadows They are ugly. * EvSidebar*: add horizontal separator To make UI more readable after previous commit.
1 parent 2bd08e3 commit 4f63d2c

8 files changed

Lines changed: 25 additions & 20 deletions

libmisc/ev-page-action-widget.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ ev_page_action_widget_init (EvPageActionWidget *action_widget)
240240
FALSE, FALSE, 0);
241241
gtk_widget_show (action_widget->label);
242242

243-
gtk_container_set_border_width (GTK_CONTAINER (action_widget), 6);
243+
g_object_set (G_OBJECT (action_widget), "margin-left", 8, "margin-right", 8, NULL);
244244
gtk_container_add (GTK_CONTAINER (action_widget), hbox);
245245
gtk_widget_show (hbox);
246246

shell/ev-sidebar-annotations.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ ev_sidebar_annotations_init (EvSidebarAnnotations *ev_annots)
139139
GtkCellRenderer *renderer;
140140
GtkTreeViewColumn *column;
141141
GtkTreeSelection *selection;
142+
GtkWidget *separator;
142143
GtkWidget *toolbar;
143144
GtkWidget *toolitem;
144145
GtkWidget *hbox;
@@ -150,7 +151,6 @@ ev_sidebar_annotations_init (EvSidebarAnnotations *ev_annots)
150151
gtk_orientable_set_orientation (GTK_ORIENTABLE (ev_annots), GTK_ORIENTATION_VERTICAL);
151152

152153
swindow = gtk_scrolled_window_new (NULL, NULL);
153-
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (swindow), GTK_SHADOW_IN);
154154
gtk_box_pack_start (GTK_BOX (ev_annots), swindow, TRUE, TRUE, 0);
155155
gtk_widget_show (swindow);
156156

@@ -181,6 +181,10 @@ ev_sidebar_annotations_init (EvSidebarAnnotations *ev_annots)
181181
gtk_container_add (GTK_CONTAINER (swindow), ev_annots->priv->tree_view);
182182
gtk_widget_show (ev_annots->priv->tree_view);
183183

184+
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
185+
gtk_box_pack_start (GTK_BOX (ev_annots), separator, FALSE, FALSE, 0);
186+
gtk_widget_show (separator);
187+
184188
toolbar = gtk_toolbar_new ();
185189
gtk_widget_show (toolbar);
186190

shell/ev-sidebar-attachments.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -542,8 +542,6 @@ ev_sidebar_attachments_init (EvSidebarAttachments *ev_attachbar)
542542
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow),
543543
GTK_POLICY_NEVER,
544544
GTK_POLICY_AUTOMATIC);
545-
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (swindow),
546-
GTK_SHADOW_IN);
547545
/* Data Model */
548546
ev_attachbar->priv->model = gtk_list_store_new (N_COLS,
549547
GDK_TYPE_PIXBUF,

shell/ev-sidebar-bookmarks.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,7 @@ ev_sidebar_bookmarks_init (EvSidebarBookmarks *sidebar_bookmarks)
418418
{
419419
EvSidebarBookmarksPrivate *priv;
420420
GtkWidget *swindow;
421+
GtkWidget *separator;
421422
GtkWidget *toolbar;
422423
GtkWidget *toolitem;
423424
GtkWidget *hbox;
@@ -433,8 +434,6 @@ ev_sidebar_bookmarks_init (EvSidebarBookmarks *sidebar_bookmarks)
433434
gtk_orientable_set_orientation (GTK_ORIENTABLE (sidebar_bookmarks), GTK_ORIENTATION_VERTICAL);
434435

435436
swindow = gtk_scrolled_window_new (NULL, NULL);
436-
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (swindow),
437-
GTK_SHADOW_IN);
438437
gtk_box_pack_start (GTK_BOX (sidebar_bookmarks), swindow, TRUE, TRUE, 0);
439438
gtk_widget_show (swindow);
440439

@@ -469,6 +468,10 @@ ev_sidebar_bookmarks_init (EvSidebarBookmarks *sidebar_bookmarks)
469468
gtk_container_add (GTK_CONTAINER (swindow), priv->tree_view);
470469
gtk_widget_show (priv->tree_view);
471470

471+
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
472+
gtk_box_pack_start (GTK_BOX (sidebar_bookmarks), separator, FALSE, FALSE, 0);
473+
gtk_widget_show (separator);
474+
472475
toolbar = gtk_toolbar_new ();
473476
gtk_widget_show (toolbar);
474477

shell/ev-sidebar-links.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -396,9 +396,6 @@ ev_sidebar_links_construct (EvSidebarLinks *ev_sidebar_links)
396396

397397
swindow = gtk_scrolled_window_new (NULL, NULL);
398398

399-
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (swindow),
400-
GTK_SHADOW_IN);
401-
402399
/* Create tree view */
403400
loading_model = create_loading_model ();
404401
priv->tree_view = gtk_tree_view_new_with_model (loading_model);

shell/ev-sidebar-thumbnails.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -884,6 +884,7 @@ static void
884884
ev_sidebar_thumbnails_init (EvSidebarThumbnails *ev_sidebar_thumbnails)
885885
{
886886
EvSidebarThumbnailsPrivate *priv;
887+
GtkWidget *separator;
887888
guint signal_id;
888889
GtkWidget *toolbar;
889890
GtkWidget *toolitem;
@@ -912,8 +913,6 @@ ev_sidebar_thumbnails_init (EvSidebarThumbnails *ev_sidebar_thumbnails)
912913

913914
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->swindow),
914915
GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
915-
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (priv->swindow),
916-
GTK_SHADOW_IN);
917916
priv->vadjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->swindow));
918917
g_signal_connect_data (priv->vadjustment, "value-changed",
919918
G_CALLBACK (adjustment_changed_cb),
@@ -924,6 +923,10 @@ ev_sidebar_thumbnails_init (EvSidebarThumbnails *ev_sidebar_thumbnails)
924923
ev_sidebar_thumbnails);
925924
gtk_box_pack_start (GTK_BOX (ev_sidebar_thumbnails), priv->swindow, TRUE, TRUE, 0);
926925

926+
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
927+
gtk_box_pack_start (GTK_BOX (ev_sidebar_thumbnails), separator, FALSE, FALSE, 0);
928+
gtk_widget_show (separator);
929+
927930
toolbar = gtk_toolbar_new ();
928931
gtk_widget_show (toolbar);
929932

shell/ev-window.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3944,10 +3944,6 @@ ev_window_run_fullscreen (EvWindow *window)
39443944
fullscreen_window = FALSE;
39453945
}
39463946

3947-
g_object_set (G_OBJECT (window->priv->scrolled_window),
3948-
"shadow-type", GTK_SHADOW_NONE,
3949-
NULL);
3950-
39513947
ev_document_model_set_fullscreen (window->priv->model, TRUE);
39523948
ev_window_update_fullscreen_action (window);
39533949

@@ -3979,10 +3975,6 @@ ev_window_stop_fullscreen (EvWindow *window,
39793975
if (!ev_document_model_get_fullscreen (window->priv->model))
39803976
return;
39813977

3982-
g_object_set (G_OBJECT (window->priv->scrolled_window),
3983-
"shadow-type", GTK_SHADOW_IN,
3984-
NULL);
3985-
39863978
ev_document_model_set_fullscreen (window->priv->model, FALSE);
39873979
ev_window_update_fullscreen_action (window);
39883980
update_chrome_flag (window, EV_CHROME_FULLSCREEN_TOOLBAR, FALSE);
@@ -7546,7 +7538,6 @@ ev_window_init (EvWindow *ev_window)
75467538
ev_window->priv->view_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
75477539
ev_window->priv->scrolled_window =
75487540
GTK_WIDGET (g_object_new (GTK_TYPE_SCROLLED_WINDOW,
7549-
"shadow-type", GTK_SHADOW_IN,
75507541
NULL));
75517542
gtk_box_pack_start (GTK_BOX (ev_window->priv->view_box),
75527543
ev_window->priv->scrolled_window,

shell/xreader.css

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
.view.content-view {
2+
background-color: @theme_bg_color;
3+
}
4+
5+
.view.content-view:selected {
6+
background-color: @theme_selected_bg_color;
7+
color: @theme_selected_fg_color;
8+
}
9+
110
evview {
211
background-color: @theme_bg_color;
312
}

0 commit comments

Comments
 (0)