diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-03-22 13:41:50 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2018-03-30 14:32:12 +0200 |
commit | 374599f8c26713905a310673d2b429083321186a (patch) | |
tree | 2ee4be182670b2ca9396a5f42d4122bed806a3ba /include/svx/searchcharmap.hxx | |
parent | 2d3a5e81e9730c1190f8592f85f5b99b6d4587ef (diff) |
weld SvxCharacterMap dialog
and SmSymDefineDialog
There's a whole bunch of interrelated stuff which needs to work at the same
time.
add menu support, keyboard support, better mouse support,
a gtk scrollable adaptor to support pseudo scrolling drawing bodge,
plugable uitest support for custom widgets, plugable a11y support
for custom widgets via the existing atk_object_wrapper_new wrapper
for XAccessible
In this specific case, change SvxCharacterMap from something that has an
internal scrollbar to a scrolledwindow where the scrollbar is external, which
drops the need for the a11y impl of SvxCharacterMap to emulate being a scrolled
window and internal table and just needs the table a11y impl
Change-Id: Ia2743d6958021c525a1900154dcbb69ae33fc400
Reviewed-on: https://gerrit.libreoffice.org/52084
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 'include/svx/searchcharmap.hxx')
-rw-r--r-- | include/svx/searchcharmap.hxx | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/include/svx/searchcharmap.hxx b/include/svx/searchcharmap.hxx index cfb46036b5f4..8f23c4b96d5a 100644 --- a/include/svx/searchcharmap.hxx +++ b/include/svx/searchcharmap.hxx @@ -50,18 +50,12 @@ namespace vcl { class Font; } class CommandEvent; class ScrollBar; -namespace svx -{ - struct SvxShowCharSetItem; - class SvxShowCharSetVirtualAcc; -} - class SVX_DLLPUBLIC SvxSearchCharSet : public SvxShowCharSet { public: - SvxSearchCharSet( vcl::Window* pParent ); + SvxSearchCharSet(weld::Builder& rBuilder, const OString& rDrawingId, + const OString& rScrollId, const VclPtr<VirtualDevice> &rDevice); virtual ~SvxSearchCharSet() override; - virtual void dispose() override; virtual void RecalculateFont(vcl::RenderContext& rRenderContext) override; @@ -76,10 +70,6 @@ public: virtual sal_Int32 getMaxCharCount() const override; -protected: - virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& ) override; - virtual void KeyInput( const KeyEvent& rKEvt ) override; - private: sal_Int32 nCount; @@ -88,6 +78,8 @@ private: std::unordered_map<sal_Int32, sal_UCS4> m_aItemList; private: virtual void DrawChars_Impl(vcl::RenderContext& rRenderContext, int n1, int n2) override; + DECL_LINK(DoPaint, weld::DrawingArea::draw_args, void); + DECL_LINK(DoKeyDown, const KeyEvent&, bool); }; #endif |