Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
d54aaea3
Kaydet (Commit)
d54aaea3
authored
Kas 05, 2015
tarafından
Miklos Vajna
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
sw tiled rendering: initial annotation support
Change-Id: I4fcb05f8a58965341cf44a1b7e2367b5cbff981d
üst
eafd3ee3
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
57 additions
and
4 deletions
+57
-4
PostItMgr.hxx
sw/inc/PostItMgr.hxx
+1
-0
SidebarWin.hxx
sw/inc/SidebarWin.hxx
+1
-0
viewsh.cxx
sw/source/core/view/viewsh.cxx
+3
-0
PostItMgr.cxx
sw/source/uibase/docvw/PostItMgr.cxx
+15
-0
SidebarTxtControl.cxx
sw/source/uibase/docvw/SidebarTxtControl.cxx
+16
-3
SidebarTxtControl.hxx
sw/source/uibase/docvw/SidebarTxtControl.hxx
+1
-0
SidebarWin.cxx
sw/source/uibase/docvw/SidebarWin.cxx
+20
-1
No files found.
sw/inc/PostItMgr.hxx
Dosyayı görüntüle @
d54aaea3
...
...
@@ -285,6 +285,7 @@ class SwPostItMgr: public SfxListener
std
::
vector
<
vcl
::
Window
*
>*
pChildren
);
void
DrawNotesForPage
(
OutputDevice
*
pOutDev
,
sal_uInt32
nPage
);
void
PaintTile
(
OutputDevice
&
rRenderContext
,
const
Rectangle
&
rRect
);
};
#endif
...
...
sw/inc/SidebarWin.hxx
Dosyayı görüntüle @
d54aaea3
...
...
@@ -177,6 +177,7 @@ class SwSidebarWin : public vcl::Window
virtual
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
accessibility
::
XAccessible
>
CreateAccessible
()
override
;
virtual
void
Draw
(
OutputDevice
*
pDev
,
const
Point
&
,
const
Size
&
,
DrawFlags
)
override
;
void
PaintTile
(
vcl
::
RenderContext
&
rRenderContext
,
const
Rectangle
&
rRect
);
protected
:
virtual
void
DataChanged
(
const
DataChangedEvent
&
aEvent
)
override
;
...
...
sw/source/core/view/viewsh.cxx
Dosyayı görüntüle @
d54aaea3
...
...
@@ -1900,6 +1900,9 @@ void SwViewShell::PaintTile(VirtualDevice &rDevice, int contextWidth, int contex
// draw - works in logic coordinates
Paint
(
rDevice
,
aOutRect
);
if
(
SwPostItMgr
*
pPostItMgr
=
GetPostItMgr
())
pPostItMgr
->
PaintTile
(
rDevice
,
aOutRect
);
// SwViewShell's output device tear down
mpOut
=
pSaveOut
;
mbInLibreOfficeKitCallback
=
false
;
...
...
sw/source/uibase/docvw/PostItMgr.cxx
Dosyayı görüntüle @
d54aaea3
...
...
@@ -847,6 +847,21 @@ void SwPostItMgr::DrawNotesForPage(OutputDevice *pOutDev, sal_uInt32 nPage)
}
}
void
SwPostItMgr
::
PaintTile
(
OutputDevice
&
rRenderContext
,
const
Rectangle
&
/*rRect*/
)
{
for
(
SwSidebarItem
*
pItem
:
mvPostItFields
)
{
SwSidebarWin
*
pPostIt
=
pItem
->
pPostIt
;
if
(
!
pPostIt
)
continue
;
Point
aPoint
(
mpEditWin
->
PixelToLogic
(
pPostIt
->
GetPosPixel
()));
Size
aSize
(
pPostIt
->
PixelToLogic
(
pPostIt
->
GetSizePixel
()));
Rectangle
aRectangle
(
aPoint
,
aSize
);
pPostIt
->
PaintTile
(
rRenderContext
,
aRectangle
);
}
}
void
SwPostItMgr
::
Scroll
(
const
long
lScroll
,
const
unsigned
long
aPage
)
{
OSL_ENSURE
((
lScroll
%
GetScrollSize
()
)
==
0
,
"SwPostItMgr::Scroll: scrolling by wrong value"
);
...
...
sw/source/uibase/docvw/SidebarTxtControl.cxx
Dosyayı görüntüle @
d54aaea3
...
...
@@ -53,6 +53,7 @@
#include <shellres.hxx>
#include <SwRewriter.hxx>
#include <memory>
#include <comphelper/lok.hxx>
namespace
sw
{
namespace
sidebarwindows
{
...
...
@@ -151,25 +152,37 @@ void SidebarTextControl::Draw(OutputDevice* pDev, const Point& rPt, const Size&
}
}
void
SidebarTextControl
::
PaintTile
(
vcl
::
RenderContext
&
rRenderContext
,
const
Rectangle
&
rRect
)
{
Paint
(
rRenderContext
,
rRect
);
}
void
SidebarTextControl
::
Paint
(
vcl
::
RenderContext
&
rRenderContext
,
const
Rectangle
&
rRect
)
{
Point
aPoint
(
0
,
0
);
if
(
comphelper
::
LibreOfficeKit
::
isActive
())
aPoint
=
rRect
.
TopLeft
();
if
(
!
rRenderContext
.
GetSettings
().
GetStyleSettings
().
GetHighContrastMode
())
{
if
(
mrSidebarWin
.
IsMouseOverSidebarWin
()
||
HasFocus
())
{
rRenderContext
.
DrawGradient
(
Rectangle
(
Point
(
0
,
0
)
,
rRenderContext
.
PixelToLogic
(
GetSizePixel
())),
rRenderContext
.
DrawGradient
(
Rectangle
(
aPoint
,
rRenderContext
.
PixelToLogic
(
GetSizePixel
())),
Gradient
(
GradientStyle_LINEAR
,
mrSidebarWin
.
ColorDark
(),
mrSidebarWin
.
ColorDark
()));
}
else
{
rRenderContext
.
DrawGradient
(
Rectangle
(
Point
(
0
,
0
)
,
rRenderContext
.
PixelToLogic
(
GetSizePixel
())),
rRenderContext
.
DrawGradient
(
Rectangle
(
aPoint
,
rRenderContext
.
PixelToLogic
(
GetSizePixel
())),
Gradient
(
GradientStyle_LINEAR
,
mrSidebarWin
.
ColorLight
(),
mrSidebarWin
.
ColorDark
()));
}
}
if
(
GetTextView
())
{
GetTextView
()
->
Paint
(
rRect
,
&
rRenderContext
);
if
(
comphelper
::
LibreOfficeKit
::
isActive
())
GetTextView
()
->
GetOutliner
()
->
Draw
(
&
rRenderContext
,
rRect
);
else
GetTextView
()
->
Paint
(
rRect
,
&
rRenderContext
);
}
if
(
mrSidebarWin
.
GetLayoutStatus
()
==
SwPostItHelper
::
DELETED
)
...
...
sw/source/uibase/docvw/SidebarTxtControl.hxx
Dosyayı görüntüle @
d54aaea3
...
...
@@ -69,6 +69,7 @@ class SidebarTextControl : public Control
virtual
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
accessibility
::
XAccessible
>
CreateAccessible
()
override
;
virtual
void
Draw
(
OutputDevice
*
pDev
,
const
Point
&
,
const
Size
&
,
DrawFlags
)
override
;
void
PaintTile
(
vcl
::
RenderContext
&
rRenderContext
,
const
Rectangle
&
rRect
);
};
}
}
// end of namespace sw::sidebarwindows
...
...
sw/source/uibase/docvw/SidebarWin.cxx
Dosyayı görüntüle @
d54aaea3
...
...
@@ -80,6 +80,7 @@
#include <drawinglayer/processor2d/processorfromoutputdevice.hxx>
#include <drawinglayer/primitive2d/shadowprimitive2d.hxx>
#include <memory>
#include <comphelper/lok.hxx>
namespace
sw
{
namespace
sidebarwindows
{
...
...
@@ -230,7 +231,25 @@ void SwSidebarWin::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rR
Size
(
GetMetaButtonAreaWidth
(),
mpMetadataAuthor
->
GetSizePixel
().
Height
()
+
mpMetadataDate
->
GetSizePixel
().
Height
()));
rRenderContext
.
DrawRect
(
PixelToLogic
(
aRectangle
));
if
(
comphelper
::
LibreOfficeKit
::
isActive
())
aRectangle
=
rRect
;
else
aRectangle
=
PixelToLogic
(
aRectangle
);
rRenderContext
.
DrawRect
(
aRectangle
);
}
}
void
SwSidebarWin
::
PaintTile
(
vcl
::
RenderContext
&
rRenderContext
,
const
Rectangle
&
rRect
)
{
Paint
(
rRenderContext
,
rRect
);
for
(
sal_uInt16
i
=
0
;
i
<
GetChildCount
();
++
i
)
{
vcl
::
Window
*
pChild
=
GetChild
(
i
);
if
(
pChild
==
mpSidebarTextControl
.
get
())
mpSidebarTextControl
->
PaintTile
(
rRenderContext
,
rRect
);
else
SAL_WARN
(
"sw.uibase"
,
"SwSidebarWin::PaintTile: unhandled child "
<<
pChild
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment