Commit 34d5ef7e authored by Christoffer Ackelman's avatar Christoffer Ackelman

More missing initializations in Glow.

parent 8e74db9c
...@@ -597,8 +597,6 @@ GlowDrawGtk::GlowDrawGtk(GtkWidget* toplevel, void** glow_ctx, ...@@ -597,8 +597,6 @@ GlowDrawGtk::GlowDrawGtk(GtkWidget* toplevel, void** glow_ctx,
display = gtk_widget_get_display(toplevel); display = gtk_widget_get_display(toplevel);
m_wind.window = toplevel->window; m_wind.window = toplevel->window;
screen = gtk_widget_get_screen(toplevel); screen = gtk_widget_get_screen(toplevel);
m_wind.clip_cnt = 0;
m_wind.clip_on = 0;
ctx->mw = &m_wind; ctx->mw = &m_wind;
ctx->navw = &nav_wind; ctx->navw = &nav_wind;
......
...@@ -54,7 +54,12 @@ class DrawWindGtk : public DrawWind { ...@@ -54,7 +54,12 @@ class DrawWindGtk : public DrawWind {
public: public:
DrawWindGtk() DrawWindGtk()
{ {
zoom_factor_x = zoom_factor_y = base_zoom_factor = 100;
offset_x = offset_y = 0;
window_width = window_height = 0;
subwindow_x = subwindow_y = 0;
subwindow_scale = 1; subwindow_scale = 1;
clip_cnt = clip_on = 0;
memset(clip_rectangle, 0, sizeof(clip_rectangle)); memset(clip_rectangle, 0, sizeof(clip_rectangle));
} }
GdkWindow* window = NULL; GdkWindow* window = NULL;
......
...@@ -280,8 +280,6 @@ GlowDrawQt::GlowDrawQt(QWidget* toplevel, void** glow_ctx, ...@@ -280,8 +280,6 @@ GlowDrawQt::GlowDrawQt(QWidget* toplevel, void** glow_ctx,
assert(dynamic_cast<QtScrollWidgetGlow*>(toplevel) != NULL); assert(dynamic_cast<QtScrollWidgetGlow*>(toplevel) != NULL);
m_wind.window = dynamic_cast<QtScrollWidgetGlow*>(toplevel); m_wind.window = dynamic_cast<QtScrollWidgetGlow*>(toplevel);
m_wind.buffer = &(dynamic_cast<QtScrollWidgetGlow*>(toplevel)->image); m_wind.buffer = &(dynamic_cast<QtScrollWidgetGlow*>(toplevel)->image);
m_wind.clip_cnt = 0;
m_wind.clip_on = 0;
ctx->mw = &m_wind; ctx->mw = &m_wind;
ctx->navw = &nav_wind; ctx->navw = &nav_wind;
......
...@@ -60,7 +60,12 @@ class DrawWindQt : public DrawWind { ...@@ -60,7 +60,12 @@ class DrawWindQt : public DrawWind {
public: public:
DrawWindQt() DrawWindQt()
{ {
zoom_factor_x = zoom_factor_y = base_zoom_factor = 100;
offset_x = offset_y = 0;
window_width = window_height = 0;
subwindow_x = subwindow_y = 0;
subwindow_scale = 1; subwindow_scale = 1;
clip_cnt = clip_on = 0;
memset(clip_rectangle, 0, sizeof(clip_rectangle)); memset(clip_rectangle, 0, sizeof(clip_rectangle));
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment