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
b010e407
Kaydet (Commit)
b010e407
authored
Tem 03, 2015
tarafından
László Németh
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
tdf#92241 fix crashes and rendering of symbol set previews
Change-Id: I43397f2b0caa31c334f87acf11fc96df2e051ad8
üst
4802bf32
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
38 additions
and
7 deletions
+38
-7
charmap.hxx
include/svx/charmap.hxx
+3
-0
ctrl.hxx
include/vcl/ctrl.hxx
+2
-0
charmap.cxx
svx/source/dialog/charmap.cxx
+18
-1
ctrl.cxx
vcl/source/control/ctrl.cxx
+15
-6
No files found.
include/svx/charmap.hxx
Dosyayı görüntüle @
b010e407
...
...
@@ -58,6 +58,7 @@ public:
Link
<>
GetPreSelectHdl
()
const
{
return
aHighHdl
;
}
void
SetPreSelectHdl
(
const
Link
<>&
rHdl
)
{
aPreSelectHdl
=
rHdl
;
}
static
sal_uInt32
&
getSelectedChar
();
void
SetFont
(
const
vcl
::
Font
&
rFont
);
svx
::
SvxShowCharSetItem
*
ImplGetItem
(
int
_nPos
);
int
FirstInView
()
const
;
...
...
@@ -108,12 +109,14 @@ private:
sal_Int32
nSelectedIndex
;
FontCharMapPtr
mpFontCharMap
;
Size
maFontSize
;
VclPtr
<
ScrollBar
>
aVscrollSB
;
bool
mbRecalculateFont
:
1
;
bool
mbUpdateForeground
:
1
;
bool
mbUpdateBackground
:
1
;
private
:
void
DrawChars_Impl
(
vcl
::
RenderContext
&
rRenderContext
,
int
n1
,
int
n2
);
void
InitSettings
(
vcl
::
RenderContext
&
rRenderContext
);
...
...
include/vcl/ctrl.hxx
Dosyayı görüntüle @
b010e407
...
...
@@ -41,6 +41,8 @@ protected:
private
:
bool
mbHasControlFocus
;
bool
mbFont
;
bool
mbForeground
;
Link
<>
maGetFocusHdl
;
Link
<>
maLoseFocusHdl
;
...
...
svx/source/dialog/charmap.cxx
Dosyayı görüntüle @
b010e407
...
...
@@ -57,6 +57,7 @@ sal_uInt32& SvxShowCharSet::getSelectedChar()
SvxShowCharSet
::
SvxShowCharSet
(
vcl
::
Window
*
pParent
)
:
Control
(
pParent
,
WB_TABSTOP
|
WB_BORDER
)
,
m_pAccessible
(
nullptr
)
,
maFontSize
(
0
,
0
)
,
aVscrollSB
(
VclPtr
<
ScrollBar
>::
Create
(
this
,
WB_VERT
)
)
,
mbRecalculateFont
(
true
)
,
mbUpdateForeground
(
true
)
...
...
@@ -114,6 +115,7 @@ void SvxShowCharSet::StateChanged(StateChangedType nType)
Invalidate
();
Control
::
StateChanged
(
nType
);
}
...
...
@@ -331,6 +333,12 @@ void SvxShowCharSet::Paint( vcl::RenderContext& rRenderContext, const Rectangle&
DrawChars_Impl
(
rRenderContext
,
FirstInView
(),
LastInView
());
}
void
SvxShowCharSet
::
SetFont
(
const
vcl
::
Font
&
rFont
)
{
Control
::
SetFont
(
rFont
);
Invalidate
();
}
void
SvxShowCharSet
::
DeSelect
()
{
Invalidate
();
...
...
@@ -506,6 +514,14 @@ void SvxShowCharSet::InitSettings(vcl::RenderContext& rRenderContext)
mbUpdateBackground
=
false
;
}
vcl
::
Font
aFont
(
rRenderContext
.
GetFont
());
aFont
.
SetWeight
(
WEIGHT_LIGHT
);
aFont
.
SetAlign
(
ALIGN_TOP
);
aFont
.
SetSize
(
maFontSize
);
aFont
.
SetTransparent
(
true
);
rRenderContext
.
SetFont
(
aFont
);
}
...
...
@@ -536,7 +552,8 @@ void SvxShowCharSet::RecalculateFont(vcl::RenderContext& rRenderContext)
aFont
.
SetWeight
(
WEIGHT_LIGHT
);
aFont
.
SetAlign
(
ALIGN_TOP
);
int
nFontHeight
=
(
aSize
.
Height
()
-
5
)
*
2
/
(
3
*
ROW_COUNT
);
aFont
.
SetSize
(
rRenderContext
.
PixelToLogic
(
Size
(
0
,
nFontHeight
)));
maFontSize
=
rRenderContext
.
PixelToLogic
(
Size
(
0
,
nFontHeight
));
aFont
.
SetSize
(
maFontSize
);
aFont
.
SetTransparent
(
true
);
rRenderContext
.
SetFont
(
aFont
);
rRenderContext
.
GetFontCharMap
(
mpFontCharMap
);
...
...
vcl/source/control/ctrl.cxx
Dosyayı görüntüle @
b010e407
...
...
@@ -36,6 +36,8 @@ using namespace vcl;
void
Control
::
ImplInitControlData
()
{
mbHasControlFocus
=
false
;
mbFont
=
false
;
mbForeground
=
false
;
mpControlData
=
new
ImplControlData
;
}
...
...
@@ -417,16 +419,23 @@ void Control::ApplySettings(vcl::RenderContext& rRenderContext)
{
const
StyleSettings
&
rStyleSettings
=
rRenderContext
.
GetSettings
().
GetStyleSettings
();
vcl
::
Font
rFont
(
GetCanonicalFont
(
rStyleSettings
));
ApplyControlFont
(
rRenderContext
,
rFont
);
ApplyControlForeground
(
rRenderContext
,
GetCanonicalTextColor
(
rStyleSettings
));
if
(
mbFont
)
{
vcl
::
Font
rFont
(
GetCanonicalFont
(
rStyleSettings
));
ApplyControlFont
(
rRenderContext
,
rFont
);
}
rRenderContext
.
SetTextFillColor
();
if
(
mbFont
||
mbForeground
)
{
ApplyControlForeground
(
rRenderContext
,
GetCanonicalTextColor
(
rStyleSettings
));
rRenderContext
.
SetTextFillColor
();
}
}
void
Control
::
ImplInitSettings
(
const
bool
,
const
bool
)
void
Control
::
ImplInitSettings
(
const
bool
_bFont
,
const
bool
_bForeground
)
{
mbFont
=
_bFont
;
mbForeground
=
_bForeground
;
ApplySettings
(
*
this
);
}
...
...
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