diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx index ae3695494d71..88a09b32fa0c 100644 --- a/extensions/source/scanner/grid.cxx +++ b/extensions/source/scanner/grid.cxx @@ -119,7 +119,7 @@ class GridWindow : public Window void drawLine( double x1, double y1, double x2, double y2 ); public: GridWindow(Window* pParent); - void Init(double* pXValues, double* pYValues, int nValues, bool bCutValues); + void Init(double* pXValues, double* pYValues, int nValues, bool bCutValues, const BitmapEx &rMarkerBitmap); virtual ~GridWindow(); void setBoundings( double fMinX, double fMinY, double fMaxX, double fMaxY ); @@ -159,13 +159,13 @@ GridWindow::GridWindow(Window* pParent) , m_bCutValues(false) , m_aHandles() , m_nDragIndex(0xffffffff) - , m_aMarkerBitmap( FixedImage::loadThemeImage("extensions/source/scanner/handle.png").GetBitmapEx() ) { SetMapMode(MapMode(MAP_PIXEL)); } -void GridWindow::Init(double* pXValues, double* pYValues, int nValues, bool bCutValues) +void GridWindow::Init(double* pXValues, double* pYValues, int nValues, bool bCutValues, const BitmapEx &rMarkerBitmap) { + m_aMarkerBitmap = rMarkerBitmap; m_pXValues = pXValues; m_pOrigYValues = pYValues; m_nValues = nValues; @@ -214,7 +214,7 @@ GridDialog::GridDialog(double* pXValues, double* pYValues, int nValues, Window* get(m_pResetTypeBox, "resetTypeCombobox"); get(m_pResetButton, "resetButton"); get(m_pGridWindow, "gridwindow"); - m_pGridWindow->Init(pXValues, pYValues, nValues, bCutValues); + m_pGridWindow->Init(pXValues, pYValues, nValues, bCutValues, get("handle")->GetImage().GetBitmapEx()); m_pResetTypeBox->SelectEntryPos( 0 ); diff --git a/extensions/uiconfig/scanner/ui/griddialog.ui b/extensions/uiconfig/scanner/ui/griddialog.ui index 25638a5e43d1..baebe9f10e3a 100644 --- a/extensions/uiconfig/scanner/ui/griddialog.ui +++ b/extensions/uiconfig/scanner/ui/griddialog.ui @@ -1,8 +1,8 @@ - + False 6 @@ -80,6 +80,18 @@ 3 + + + False + True + extensions/source/scanner/handle.png + + + False + True + 4 + + False