IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2026-09-03 20:53:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Drop callback that reloads report when a report tab is selected

Browse Source 
This has the unwanted side-effect of misaligning the chart
legends (due to some internal bug in webkit). Resizing the window
properly redraws the chart afterwards, but leaving the page and
returning reloads the page again, hitting the bug again. This
prevents multiple report tabs open at once to show a correct chart.
Each resize of the window to correct one chart will trigger a
misaligned legend on all other charts the next time you look at them.

The disadvantage of removing this code is that reports loaded
automatically when gnucash opens are not sized properly. (All but
the one in the very last tab of the book being opened, that is).
However these pages can be corrected by manually reloading them
once. That's annoying but at least allows for correctly displayed reports.

A proper solution must be found for this of course.
This commit is contained in:
Geert Janssens
2017-02-01 21:46:01 +01:00
parent 996b6047fc
commit d503f3438e
1 changed files with 7 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/report/report-gnome/gnc-plugin-page-report.c
+7 -43
View File
@@ -120,9 +120,6 @@ typedef struct GncPluginPageReportPrivate
* the window is closed. */
SCM edited_reports;
/* This is set to mark the fact that we need to reload the html */
gboolean need_reload;
/* The page is in the process of reloading the html */
gboolean reloading;
@@ -158,7 +155,6 @@ static int gnc_plugin_page_report_check_urltype(URLType t);
static void gnc_plugin_page_report_load_cb(GncHtml * html, URLType type,
const gchar * location, const gchar * label,
gpointer data);
static void gnc_plugin_page_report_selected_cb(GObject *object, gpointer user_data);
static void gnc_plugin_page_report_refresh (gpointer data);
static void gnc_plugin_page_report_set_fwd_button(GncPluginPageReport * page, int enabled);
static void gnc_plugin_page_report_set_back_button(GncPluginPageReport * page, int enabled);
@@ -426,9 +422,6 @@ gnc_plugin_page_report_create_widget( GncPluginPage *page )
/* load uri when view idle */
g_idle_add ((GSourceFunc)gnc_plugin_page_report_load_uri, page);
g_signal_connect (G_OBJECT (page), "selected",
G_CALLBACK (gnc_plugin_page_report_selected_cb), report);
gtk_widget_show_all( GTK_WIDGET(priv->container) );
LEAVE("container %p", priv->container);
@@ -661,23 +654,24 @@ gnc_plugin_page_report_option_change_cb(gpointer data)
/* it's probably already dirty, but make sure */
scm_call_2(dirty_report, priv->cur_report, SCM_BOOL_T);
/* Now queue the fact that we need to reload this report */
priv->need_reload = TRUE;
// jsled: this doesn't seem to cause any effect.
gtk_widget_queue_draw( GTK_WIDGET(priv->container) );
// jsled: this does.
// prevent closing this page while loading...
priv->reloading = TRUE;
// this sets the window for the progressbar
gnc_window_set_progressbar_window( GNC_WINDOW(page->window) );
// this sets the minimum size of the progressbar to that allocated
gnc_plugin_page_report_set_progressbar( page, TRUE );
/* Now queue the fact that we need to reload this report */
gnc_html_reload( priv->html, TRUE ); //reload by rebuild
gnc_plugin_page_report_set_progressbar( page, FALSE );
// this resets the window for the progressbar to NULL
gnc_window_set_progressbar_window( NULL );
priv->reloading = FALSE;
}
/* FIXME: This function does... nothing. */
@@ -709,32 +703,6 @@ gnc_plugin_page_report_history_destroy_cb(gnc_html_history_node * node,
#endif
}
/* This page got selected by the user. See if we need to reload the report.
* This may be needed in case the window got resized while this page was not selected.*/
static void
gnc_plugin_page_report_selected_cb (GObject *object, gpointer user_data)
{
GncPluginPageReport *page = GNC_PLUGIN_PAGE_REPORT(user_data);
GncPluginPageReportPrivate *priv;
g_return_if_fail(GNC_IS_PLUGIN_PAGE_REPORT(page));
priv = GNC_PLUGIN_PAGE_REPORT_GET_PRIVATE(page);
ENTER( "report_draw" );
if (!priv->need_reload)
{
LEAVE( "no reload needed" );
return;
}
priv->need_reload = FALSE;
gnc_window_set_progressbar_window( GNC_WINDOW(GNC_PLUGIN_PAGE(page)->window) );
gnc_html_reload (priv->html, FALSE); //reload by view
gnc_window_set_progressbar_window( NULL );
LEAVE( "reload forced" );
return;
}
// @param data is actually GncPluginPageReportPrivate
static void
gnc_plugin_page_report_refresh(gpointer data)
@@ -1368,13 +1336,9 @@ gnc_plugin_page_report_reload_cb( GtkAction *action, GncPluginPageReport *report
dirty_report = scm_c_eval_string("gnc:report-set-dirty?!");
scm_call_2(dirty_report, priv->cur_report, SCM_BOOL_T);
priv->need_reload = TRUE;
/* now queue the fact that we need to reload this report */
// this doens't seem to do anything...
gtk_widget_queue_draw( GTK_WIDGET(priv->container) );
// this does...
// prevent closing this page while loading...
priv->reloading = TRUE;
// this sets the window for the progressbar
gnc_window_set_progressbar_window( GNC_WINDOW(page->window) );