From eb837ef3bd2e7460e6f2f4e6b42a526bb67a2ba3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Lemaire?= Date: Mon, 3 Jun 2013 22:03:52 +0200 Subject: [PATCH] Fixed terrain painting unwanted scrolling on show --- src/editing/paysages-qt.pro | 4 ++-- src/editing/terrain/dialogterrainpainting.ui | 2 +- src/editing/{ => terrain}/widgetheightmap.cpp | 4 ++-- src/editing/{ => terrain}/widgetheightmap.h | 0 4 files changed, 5 insertions(+), 5 deletions(-) rename src/editing/{ => terrain}/widgetheightmap.cpp (99%) rename src/editing/{ => terrain}/widgetheightmap.h (100%) diff --git a/src/editing/paysages-qt.pro b/src/editing/paysages-qt.pro index 290b851..454542f 100644 --- a/src/editing/paysages-qt.pro +++ b/src/editing/paysages-qt.pro @@ -24,7 +24,7 @@ win32:LIBS += ../libpaysages.a ../libpaysages_exploring.a -lDevIL -lILU -lILUT - TRANSLATIONS = $$PROJECT_PATH/data/i18n/paysages_fr.ts HEADERS += \ - widgetheightmap.h \ + terrain/widgetheightmap.h \ widgetexplorer.h \ widgetcurveeditor.h \ tools.h \ @@ -73,7 +73,7 @@ HEADERS += \ common/previewrenderer.h SOURCES += \ - widgetheightmap.cpp \ + terrain/widgetheightmap.cpp \ widgetexplorer.cpp \ widgetcurveeditor.cpp \ tools.cpp \ diff --git a/src/editing/terrain/dialogterrainpainting.ui b/src/editing/terrain/dialogterrainpainting.ui index 72d405f..fb7a98c 100644 --- a/src/editing/terrain/dialogterrainpainting.ui +++ b/src/editing/terrain/dialogterrainpainting.ui @@ -789,7 +789,7 @@ WidgetHeightMap QWidget -
widgetheightmap.h
+
terrain/widgetheightmap.h
1 heightmapChanged() diff --git a/src/editing/widgetheightmap.cpp b/src/editing/terrain/widgetheightmap.cpp similarity index 99% rename from src/editing/widgetheightmap.cpp rename to src/editing/terrain/widgetheightmap.cpp index cd13d71..f6cde1e 100644 --- a/src/editing/widgetheightmap.cpp +++ b/src/editing/terrain/widgetheightmap.cpp @@ -35,8 +35,8 @@ QGLWidget(parent) _average_frame_time = 0.0; _last_brush_action = 0; - _last_mouse_x = 0; - _last_mouse_y = 0; + _last_mouse_x = 250; + _last_mouse_y = 250; _last_time = QDateTime::currentDateTime(); _mouse_moved = false; diff --git a/src/editing/widgetheightmap.h b/src/editing/terrain/widgetheightmap.h similarity index 100% rename from src/editing/widgetheightmap.h rename to src/editing/terrain/widgetheightmap.h