Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Port both webhelper and markdown to webkit2gtk #677

Merged
merged 16 commits into from May 30, 2018
Merged

Port both webhelper and markdown to webkit2gtk #677

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
c5f410a
[markdown] Use webkit2gtk3 (webkit2 API)
sergiomb2 Dec 9, 2017
1d5665e
[webhelper] Use webkit2gtk3 (webkit2 API)
sergiomb2 Dec 9, 2017
1fd266a
webhelper: Initial port to webkit2gtk
hyperair Jan 10, 2018
ba6142e
webhelper: Initialize webkit favicon database
hyperair Jan 13, 2018
6baf793
webhelper: Fix ctrl+scroll zooming in gtk3
hyperair Jan 13, 2018
4cff846
webhelper: Port context menu to WebKitContextMenu
hyperair Jan 13, 2018
336ac2e
webhelper: Port inspector signal handlers to webkit2gtk
hyperair Jan 17, 2018
35736fb
webhelper: Port link hovering functionality to webkit2gtk
hyperair Jan 17, 2018
1b354aa
Merge remote-tracking branch 'sergiomb2/master' into webkit2gtk
hyperair Jan 17, 2018
181029d
markdown: Use notify::is-loading instead of notify::load-status
hyperair Jan 17, 2018
2c7aaa8
webhelper, markdown: Make gtk3-only
hyperair Jan 18, 2018
630bba7
markdown: Use load-changed signal instead of listening on is-loading
hyperair Jan 18, 2018
cd19ee2
Merge remote-tracking branch 'origin/master' into webkit2gtk
hyperair May 13, 2018
1c97b5d
Reenable gtk2 for markdown
hyperair May 14, 2018
1b84e29
Markdown: Fix a typo in the Makefile.am
codebrainz May 15, 2018
b9c0252
Merge pull request #1 from codebrainz/webkit2gtk-buildsys
hyperair May 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 2 additions & 4 deletions build/markdown.m4
View file
Open in desktop
Expand Up @@ -49,12 +49,10 @@ AC_DEFUN([GP_CHECK_MARKDOWN],
GTK_VERSION=2.16
WEBKIT_VERSION=1.1.13

GP_CHECK_GTK3([webkit_package=webkit2gtk-4.0],
[webkit_package=webkit2gtk-4.0])

GP_CHECK_PLUGIN_GTK3_ONLY([markdown])
GP_CHECK_PLUGIN_DEPS([markdown], [MARKDOWN],
[$GP_GTK_PACKAGE >= ${GTK_VERSION}
$webkit_package >= ${WEBKIT_VERSION}
webkit2gtk-4.0 >= ${WEBKIT_VERSION}
gthread-2.0])

GP_COMMIT_PLUGIN_STATUS([Markdown])
Expand Down
5 changes: 2 additions & 3 deletions build/webhelper.m4
View file
Open in desktop
Expand Up @@ -19,14 +19,13 @@ AC_DEFUN([GP_CHECK_WEBHELPER],
fi
fi

GP_CHECK_GTK3([webkit_package=webkit2gtk-4.0],
[webkit_package=webkit2gtk-4.0])
GP_CHECK_PLUGIN_GTK3_ONLY([webhelper])
GP_CHECK_PLUGIN_DEPS([WebHelper], [WEBHELPER],
[$GP_GTK_PACKAGE >= ${GTK_VERSION}
glib-2.0 >= ${GLIB_VERSION}
gio-2.0 >= ${GIO_VERSION}
gdk-pixbuf-2.0 >= ${GDK_PIXBUF_VERSION}
$webkit_package >= ${WEBKIT_VERSION}
webkit2gtk-4.0 >= ${WEBKIT_VERSION}
gthread-2.0])


Expand Down
15 changes: 6 additions & 9 deletions markdown/src/viewer.c
View file
Open in desktop
Expand Up @@ -297,15 +297,12 @@ pop_scroll_pos(MarkdownViewer *self)
}

static void
on_webview_is_loading_notify(WebKitWebView *view, GParamSpec *pspec,
MarkdownViewer *self)
on_webview_load_changed(MarkdownViewer *self,
WebKitLoadEvent load_event,
WebKitWebView *web_view)
{
gboolean load_status;

g_object_get(view, "is-loading", &load_status, NULL);

/* When the webkit is done loading, reset the scroll position. */
if (!load_status) {
if (load_event == WEBKIT_LOAD_FINISHED) {
pop_scroll_pos(self);
}
}
Expand Down Expand Up @@ -389,8 +386,8 @@ markdown_viewer_update_view(MarkdownViewer *self)
* position once the webview is reloaded. */
if (self->priv->load_handle == 0) {
self->priv->load_handle =
g_signal_connect_swapped(WEBKIT_WEB_VIEW(self), "notify::is-loading",
G_CALLBACK(on_webview_is_loading_notify), self);
g_signal_connect_swapped(WEBKIT_WEB_VIEW(self), "load-changed",
G_CALLBACK(on_webview_load_changed), self);
}

webkit_web_view_load_html(WEBKIT_WEB_VIEW(self), html, base_uri);
Expand Down