IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Save the screen dimensions on button click

Browse Source 
Instead of getting the dimensions on every mouse move, just save them
on button click and use the saved values.
This commit is contained in:
Robert Fewell 2017-11-09 10:32:10 +00:00
parent 9253b50210
commit 9c3247d5cc
2 changed files with 12 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
gnucash/gnome-utils/gnc-dense-cal.c
View File

@ -1256,26 +1256,24 @@ gnc_dense_cal_button_press(GtkWidget *widget,
#if GTK_CHECK_VERSION(3,22,0)
GdkWindow *win = gdk_screen_get_root_window (gtk_widget_get_screen (widget));
GdkMonitor *mon = gdk_display_get_monitor_at_window (gtk_widget_get_display (widget), win);
GdkRectangle monitor_size;
GdkRectangle work_area_size;
#else
GdkScreen *screen = gdk_screen_get_default ();
#endif
GtkAllocation alloc;
gint doc;
gint screen_width;
gint screen_height;
GncDenseCal *dcal = GNC_DENSE_CAL(widget);
gint win_xpos = evt->x_root + 5;
gint win_ypos = evt->y_root + 5;
#if GTK_CHECK_VERSION(3,22,0)
gdk_monitor_get_geometry (mon, &monitor_size);
gdk_monitor_get_workarea (mon, &work_area_size);
screen_width = monitor_size.width;
screen_height = monitor_size.height;
dcal->screen_width = work_area_size.width;
dcal->screen_height = work_area_size.height;
#else
screen_width = gdk_screen_get_width (screen);
screen_height = gdk_screen_get_height (screen);
dcal->screen_width = gdk_screen_get_width (screen);
dcal->screen_height = gdk_screen_get_height (screen);
#endif
doc = wheres_this(dcal, evt->x, evt->y);
@ -1296,10 +1294,10 @@ gnc_dense_cal_button_press(GtkWidget *widget,
gtk_widget_queue_resize(GTK_WIDGET(dcal->transPopup));
gtk_widget_show_all(GTK_WIDGET(dcal->transPopup));
if (evt->x_root + 5 + alloc.width > screen_width)
if (evt->x_root + 5 + alloc.width > dcal->screen_width)
win_xpos = evt->x_root - 2 - alloc.width;
if (evt->y_root + 5 + alloc.height > screen_height)
if (evt->y_root + 5 + alloc.height > dcal->screen_height)
win_ypos = evt->y_root - 2 - alloc.height;
gtk_window_move(GTK_WINDOW(dcal->transPopup), win_xpos, win_ypos);
@ -1313,12 +1311,9 @@ static gint
gnc_dense_cal_motion_notify(GtkWidget *widget,
GdkEventMotion *event)
{
GdkScreen *screen = gdk_screen_get_default ();
GncDenseCal *dcal;
GtkAllocation alloc;
gint doc;
gint screen_width;
gint screen_height;
int unused;
GdkModifierType unused2;
gint win_xpos = event->x_root + 5;
@ -1345,30 +1340,14 @@ gnc_dense_cal_motion_notify(GtkWidget *widget,
doc = wheres_this(dcal, event->x, event->y);
if (doc >= 0)
{
#if GTK_CHECK_VERSION(3,22,0)
GdkWindow *win = gdk_screen_get_root_window (gtk_widget_get_screen (widget));
GdkMonitor *mon = gdk_display_get_monitor_at_window (gtk_widget_get_display (widget), win);
GdkRectangle monitor_size;
gdk_monitor_get_geometry (mon, &monitor_size);
screen_width = monitor_size.width;
screen_height = monitor_size.height;
#else
screen_width = gdk_screen_get_width (screen);
screen_height = gdk_screen_get_height (screen);
#endif
populate_hover_window(dcal, doc);
gtk_widget_queue_resize(GTK_WIDGET(dcal->transPopup));
gtk_widget_get_allocation(GTK_WIDGET(dcal->transPopup), &alloc);
gtk_widget_show_all(GTK_WIDGET(dcal->transPopup));
if (event->x_root + 5 + alloc.width > screen_width)
if (event->x_root + 5 + alloc.width > dcal->screen_width)
win_xpos = event->x_root - 2 - alloc.width;
if (event->y_root + 5 + alloc.height > screen_height)
if (event->y_root + 5 + alloc.height > dcal->screen_height)
win_ypos = event->y_root - 2 - alloc.height;
gtk_window_move(GTK_WINDOW(dcal->transPopup), win_xpos, win_ypos);

2
gnucash/gnome-utils/gnc-dense-cal.h
View File

@ -57,6 +57,8 @@ struct _GncDenseCal
gboolean showPopup;
GtkWindow *transPopup;
gint screen_width;
gint screen_height;
gint min_x_scale;
gint min_y_scale;