diff options
author | Caolán McNamara <caolanm@redhat.com> | 2020-07-25 12:52:30 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2020-07-27 20:13:41 +0200 |
commit | 32f0a170c941522d0b7c0594aa4627a84a0d1b38 (patch) | |
tree | 94f85b7cba784546bfc1feaabb81a53c195f76c0 /include/svtools | |
parent | fe019b702cfe2af24c35f40db340a82892feb69c (diff) |
weld NavigationBar
Change-Id: I5d31d603a9e5f91723a310900aeee875df1599c2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99445
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/svtools')
-rw-r--r-- | include/svtools/brwbox.hxx | 4 | ||||
-rw-r--r-- | include/svtools/recorditemwindow.hxx | 23 |
2 files changed, 19 insertions, 8 deletions
diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index 00b68803515b..63796c752ef8 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -39,7 +39,7 @@ class BrowserColumn; class BrowserHeader; class ScrollBar; -class RecordItemWindow; +class MeasureStatusBar; namespace svt { class BrowseBoxImpl; @@ -275,7 +275,7 @@ private: VclPtr<BrowserDataWin> pDataWin; // window to display data rows VclPtr<ScrollBar> pVScroll; // vertical scrollbar VclPtr<ScrollBar> aHScroll; // horizontal scrollbar - VclPtr<RecordItemWindow> aStatusBarHeight; // statusbar, just to measure its height + VclPtr<MeasureStatusBar> aStatusBarHeight; // statusbar, just to measure its height long nDataRowHeight; // height of a single data-row sal_uInt16 nTitleLines; // number of lines in title row diff --git a/include/svtools/recorditemwindow.hxx b/include/svtools/recorditemwindow.hxx index 576be8766430..06571a7b69ac 100644 --- a/include/svtools/recorditemwindow.hxx +++ b/include/svtools/recorditemwindow.hxx @@ -12,24 +12,24 @@ #include <vcl/InterimItemWindow.hxx> #include <svtools/svtdllapi.h> -class SVT_DLLPUBLIC RecordItemWindow : public InterimItemWindow +class SVT_DLLPUBLIC RecordItemWindowBase { public: - RecordItemWindow(vcl::Window* pParent, bool bHasFrame); - virtual void dispose() override; - virtual ~RecordItemWindow() override; + RecordItemWindowBase(std::unique_ptr<weld::Entry> xEntry); + virtual ~RecordItemWindowBase(); void set_text(const OUString& rText) { m_xWidget->set_text(rText); } void set_font(const vcl::Font& rFont) { m_xWidget->set_font(rFont); } + void set_help_id(const OString& rHelpId) { m_xWidget->set_help_id(rHelpId); } protected: + std::unique_ptr<weld::Entry> m_xWidget; + virtual bool DoKeyInput(const KeyEvent& rEvt); private: virtual void PositionFired(sal_Int64 nRecord); - std::unique_ptr<weld::Entry> m_xWidget; - DECL_LINK(KeyInputHdl, const KeyEvent&, bool); DECL_LINK(ActivatedHdl, weld::Entry&, bool); @@ -39,4 +39,15 @@ private: void FirePosition(bool bForce); }; +class SVT_DLLPUBLIC RecordItemWindow : public InterimItemWindow, public RecordItemWindowBase +{ +public: + RecordItemWindow(vcl::Window* pParent, bool bHasFrame); + virtual void dispose() override; + virtual ~RecordItemWindow() override; + +protected: + virtual bool DoKeyInput(const KeyEvent& rEvt) override; +}; + /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ |