diff options
18 files changed, 62 insertions, 26 deletions
diff --git a/icon-themes/elementary/vcl/res/scrbmp.png b/icon-themes/elementary/vcl/res/scrbmp.png Binary files differdeleted file mode 100644 index 2f1b62fb08f0..000000000000 --- a/icon-themes/elementary/vcl/res/scrbmp.png +++ /dev/null diff --git a/icon-themes/elementary/vcl/res/scrollh.png b/icon-themes/elementary/vcl/res/scrollh.png Binary files differnew file mode 100644 index 000000000000..a828538d40cb --- /dev/null +++ b/icon-themes/elementary/vcl/res/scrollh.png diff --git a/icon-themes/elementary/vcl/res/scrollv.png b/icon-themes/elementary/vcl/res/scrollv.png Binary files differnew file mode 100644 index 000000000000..77ef8769e84e --- /dev/null +++ b/icon-themes/elementary/vcl/res/scrollv.png diff --git a/icon-themes/elementary/vcl/res/scrollvh.png b/icon-themes/elementary/vcl/res/scrollvh.png Binary files differnew file mode 100644 index 000000000000..838e66517279 --- /dev/null +++ b/icon-themes/elementary/vcl/res/scrollvh.png diff --git a/icon-themes/elementary/vcl/res/wheelh.png b/icon-themes/elementary/vcl/res/wheelh.png Binary files differnew file mode 100644 index 000000000000..61776adad1ac --- /dev/null +++ b/icon-themes/elementary/vcl/res/wheelh.png diff --git a/icon-themes/elementary/vcl/res/wheelv.png b/icon-themes/elementary/vcl/res/wheelv.png Binary files differnew file mode 100644 index 000000000000..0fbadb97beda --- /dev/null +++ b/icon-themes/elementary/vcl/res/wheelv.png diff --git a/icon-themes/elementary/vcl/res/wheelvh.png b/icon-themes/elementary/vcl/res/wheelvh.png Binary files differnew file mode 100644 index 000000000000..091d05a57159 --- /dev/null +++ b/icon-themes/elementary/vcl/res/wheelvh.png diff --git a/icon-themes/galaxy/vcl/res/scrbmp.png b/icon-themes/galaxy/vcl/res/scrbmp.png Binary files differdeleted file mode 100644 index 901546f61efb..000000000000 --- a/icon-themes/galaxy/vcl/res/scrbmp.png +++ /dev/null diff --git a/icon-themes/galaxy/vcl/res/scrollh.png b/icon-themes/galaxy/vcl/res/scrollh.png Binary files differnew file mode 100644 index 000000000000..e9d84d2d0657 --- /dev/null +++ b/icon-themes/galaxy/vcl/res/scrollh.png diff --git a/icon-themes/galaxy/vcl/res/scrollv.png b/icon-themes/galaxy/vcl/res/scrollv.png Binary files differnew file mode 100644 index 000000000000..77ef8769e84e --- /dev/null +++ b/icon-themes/galaxy/vcl/res/scrollv.png diff --git a/icon-themes/galaxy/vcl/res/scrollvh.png b/icon-themes/galaxy/vcl/res/scrollvh.png Binary files differnew file mode 100644 index 000000000000..8ca3d22bdd19 --- /dev/null +++ b/icon-themes/galaxy/vcl/res/scrollvh.png diff --git a/icon-themes/galaxy/vcl/res/wheelh.png b/icon-themes/galaxy/vcl/res/wheelh.png Binary files differnew file mode 100644 index 000000000000..12affc049951 --- /dev/null +++ b/icon-themes/galaxy/vcl/res/wheelh.png diff --git a/icon-themes/galaxy/vcl/res/wheelv.png b/icon-themes/galaxy/vcl/res/wheelv.png Binary files differnew file mode 100644 index 000000000000..3a5ab34d98a9 --- /dev/null +++ b/icon-themes/galaxy/vcl/res/wheelv.png diff --git a/icon-themes/galaxy/vcl/res/wheelvh.png b/icon-themes/galaxy/vcl/res/wheelvh.png Binary files differnew file mode 100644 index 000000000000..de2277aa7b6b --- /dev/null +++ b/icon-themes/galaxy/vcl/res/wheelvh.png diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc index 4c293932c7c2..a8c1a0f142c3 100644 --- a/vcl/inc/svids.hrc +++ b/vcl/inc/svids.hrc @@ -37,16 +37,21 @@ #define SV_RESID_BITMAP_SPLITVARW 1043 #define SV_RESID_BITMAP_SCROLLMSK 1050 -#define SV_RESID_BITMAP_SCROLLBMP 1051 -#define SV_RESID_BITMAP_CLOSEDOC 1052 -#define SV_RESID_BITMAP_INDEX 1053 -#define SV_RESID_BITMAP_REFRESH 1054 -#define SV_RESID_BITMAP_NOTEBOOKBAR 1055 - -#define SV_DISCLOSURE_PLUS 1060 -#define SV_DISCLOSURE_MINUS 1061 - -#define RID_STR_PAPERNAMES 1070 +#define SV_RESID_BITMAP_WHEELVH 1051 +#define SV_RESID_BITMAP_WHEELV 1052 +#define SV_RESID_BITMAP_WHEELH 1053 +#define SV_RESID_BITMAP_SCROLLVH 1054 +#define SV_RESID_BITMAP_SCROLLV 1055 +#define SV_RESID_BITMAP_SCROLLH 1056 +#define SV_RESID_BITMAP_CLOSEDOC 1057 +#define SV_RESID_BITMAP_INDEX 1058 +#define SV_RESID_BITMAP_REFRESH 1059 +#define SV_RESID_BITMAP_NOTEBOOKBAR 1060 + +#define SV_DISCLOSURE_PLUS 1070 +#define SV_DISCLOSURE_MINUS 1071 + +#define RID_STR_PAPERNAMES 1080 #define SV_RESID_MENU_EDIT 2000 #define SV_MENU_EDIT_UNDO 1 diff --git a/vcl/source/src/images.src b/vcl/source/src/images.src index c29f357f8baf..f1011e5bd34f 100644 --- a/vcl/source/src/images.src +++ b/vcl/source/src/images.src @@ -29,9 +29,34 @@ Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_MONOOFFSET) File = "checkmono.bmp"; }; -Bitmap (SV_RESID_BITMAP_SCROLLBMP) +Bitmap (SV_RESID_BITMAP_SCROLLVH) { - File = "scrbmp.png"; + File = "scrollvh.png"; +}; + +Bitmap (SV_RESID_BITMAP_SCROLLV) +{ + File = "scrollv.png"; +}; + +Bitmap (SV_RESID_BITMAP_SCROLLH) +{ + File = "scrollh.png"; +}; + +Bitmap (SV_RESID_BITMAP_WHEELVH) +{ + File = "wheelvh.png"; +}; + +Bitmap (SV_RESID_BITMAP_WHEELV) +{ + File = "wheelv.png"; +}; + +Bitmap (SV_RESID_BITMAP_WHEELH) +{ + File = "wheelh.png"; }; Bitmap (SV_RESID_BITMAP_SCROLLMSK) diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx index 07a762f93328..6433a34fd09d 100644 --- a/vcl/source/window/scrwnd.cxx +++ b/vcl/source/window/scrwnd.cxx @@ -121,9 +121,15 @@ void ImplWheelWindow::ImplSetRegion( const Bitmap& rRegionBmp ) void ImplWheelWindow::ImplCreateImageList() { ResMgr* pResMgr = ImplGetResMgr(); - if( pResMgr ) - maImgList.InsertFromHorizontalBitmap - ( ResId( SV_RESID_BITMAP_SCROLLBMP, *pResMgr ), 6, nullptr ); + if (pResMgr) + { + maImgList.push_back(Image(BitmapEx(ResId(SV_RESID_BITMAP_SCROLLVH, *pResMgr)))); + maImgList.push_back(Image(BitmapEx(ResId(SV_RESID_BITMAP_SCROLLV, *pResMgr)))); + maImgList.push_back(Image(BitmapEx(ResId(SV_RESID_BITMAP_SCROLLH, *pResMgr)))); + maImgList.push_back(Image(BitmapEx(ResId(SV_RESID_BITMAP_WHEELVH, *pResMgr)))); + maImgList.push_back(Image(BitmapEx(ResId(SV_RESID_BITMAP_WHEELV, *pResMgr)))); + maImgList.push_back(Image(BitmapEx(ResId(SV_RESID_BITMAP_WHEELH, *pResMgr)))); + } } void ImplWheelWindow::ImplSetWheelMode( WheelMode nWheelMode ) @@ -149,35 +155,35 @@ void ImplWheelWindow::ImplSetWheelMode( WheelMode nWheelMode ) void ImplWheelWindow::ImplDrawWheel(vcl::RenderContext& rRenderContext) { - sal_uInt16 nId; + int nIndex; switch (mnWheelMode) { case WheelMode::VH: - nId = 1; + nIndex = 0; break; case WheelMode::V: - nId = 2; + nIndex = 1; break; case WheelMode::H: - nId = 3; + nIndex = 2; break; case WheelMode::ScrollVH: - nId = 4; + nIndex = 3; break; case WheelMode::ScrollV: - nId = 5; + nIndex = 4; break; case WheelMode::ScrollH: - nId = 6; + nIndex = 5; break; default: - nId = 0; + nIndex = -1; break; } - if (nId) - rRenderContext.DrawImage(Point(), maImgList.GetImage(nId)); + if (nIndex >= 0) + rRenderContext.DrawImage(Point(), maImgList[nIndex]); } void ImplWheelWindow::ImplRecalcScrollValues() diff --git a/vcl/source/window/scrwnd.hxx b/vcl/source/window/scrwnd.hxx index ae233075c7b6..3f1c211c71a4 100644 --- a/vcl/source/window/scrwnd.hxx +++ b/vcl/source/window/scrwnd.hxx @@ -43,7 +43,7 @@ class ImplWheelWindow : public FloatingWindow { private: - ImageList maImgList; + std::vector<Image> maImgList; Point maLastMousePos; Point maCenter; Timer* mpTimer; |
