summaryrefslogtreecommitdiffstats
path: root/vcl/win
diff options
context:
space:
mode:
authorAshod Nakashian <ashodnakashian@yahoo.com>2015-08-30 22:52:03 -0400
committerCaolán McNamara <caolanm@redhat.com>2015-10-01 09:33:35 +0000
commit54a2c8c006e2f216e9d8c6b0ed625180c843c48b (patch)
treef418de3d5ec3dbb10435d8cb7e993ad7c5d232bf /vcl/win
parenttdf#87234 BREEZE: Fixing icons in the navigator sidebar (diff)
downloadcore-54a2c8c006e2f216e9d8c6b0ed625180c843c48b.tar.gz
core-54a2c8c006e2f216e9d8c6b0ed625180c843c48b.zip
tdf#39080 Interactive hide-whitespace mode
Support for enabling and disabling hide-whitespace by clicking between page frames. Disabled header and footer decorators when hide-whitepsace is enabled, and page size is trimmed to the contents of each page. Experimental/suggestive mouse pointers added but only tested on Windows. Change-Id: Ia2faeeda9e3e783ffaf5340aa69303a4218892a7 Reviewed-on: https://gerrit.libreoffice.org/18156 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/win')
-rw-r--r--vcl/win/source/src/salsrc.rc2
-rw-r--r--vcl/win/source/src/wshide.curbin0 -> 326 bytes
-rw-r--r--vcl/win/source/src/wsshow.curbin0 -> 326 bytes
-rw-r--r--vcl/win/source/window/salframe.cxx4
4 files changed, 5 insertions, 1 deletions
diff --git a/vcl/win/source/src/salsrc.rc b/vcl/win/source/src/salsrc.rc
index 2084bc13609f..c45935c59594 100644
--- a/vcl/win/source/src/salsrc.rc
+++ b/vcl/win/source/src/salsrc.rc
@@ -83,6 +83,8 @@ SAL_RESID_POINTER_TAB_SELECT_SE CURSOR tblselse.cur
SAL_RESID_POINTER_TAB_SELECT_W CURSOR tblselw.cur
SAL_RESID_POINTER_TAB_SELECT_SW CURSOR tblselsw.cur
SAL_RESID_POINTER_PAINTBRUSH CURSOR pntbrsh.cur
+SAL_RESID_POINTER_HIDEWHITESPACE CURSOR wshide.cur
+SAL_RESID_POINTER_SHOWWHITESPACE CURSOR wsshow.cur
SAL_RESID_BITMAP_50 BITMAP "50.bmp"
diff --git a/vcl/win/source/src/wshide.cur b/vcl/win/source/src/wshide.cur
new file mode 100644
index 000000000000..bfa8fdfdbac0
--- /dev/null
+++ b/vcl/win/source/src/wshide.cur
Binary files differ
diff --git a/vcl/win/source/src/wsshow.cur b/vcl/win/source/src/wsshow.cur
new file mode 100644
index 000000000000..e0c21060344d
--- /dev/null
+++ b/vcl/win/source/src/wsshow.cur
Binary files differ
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 3a61bc2e1338..3ac3f8f3c6ec 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -2156,8 +2156,10 @@ void WinSalFrame::SetPointer( PointerStyle ePointerStyle )
{ 0, 0, SAL_RESID_POINTER_TAB_SELECT_SW }, // POINTER_TAB_SELECT_SW
// #i20119#
- { 0, 0, SAL_RESID_POINTER_PAINTBRUSH } // POINTER_PAINTBRUSH
+ { 0, 0, SAL_RESID_POINTER_PAINTBRUSH }, // POINTER_PAINTBRUSH
+ { 0, 0, SAL_RESID_POINTER_HIDEWHITESPACE }, // POINTER_HIDEWHITESPACE
+ { 0, 0, SAL_RESID_POINTER_SHOWWHITESPACE } // POINTER_UNHIDEWHITESPACE
};
// Mousepointer loaded ?