diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2012-05-28 09:07:11 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2012-05-28 09:26:38 +0200 |
| commit | d02e19e3d8697132f63eca353047a572b1e459ea (patch) | |
| tree | bc2a6f346fba35ece9e05cb667248c4b2abe496c /vcl | |
| parent | 94713bbeca876c1718305791d45ff8bb986da433 (diff) | |
calc input line: Native rendering of the input line.
[Including few adjustments in the way the scrollbar is being calculated.]
Change-Id: I247ee139864a119bdec9dead64e51d9aace385ff
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/vcl/decoview.hxx | 1 | ||||
| -rw-r--r-- | vcl/inc/vcl/window.hxx | 1 | ||||
| -rw-r--r-- | vcl/source/window/brdwin.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/window/decoview.cxx | 16 |
4 files changed, 22 insertions, 0 deletions
diff --git a/vcl/inc/vcl/decoview.hxx b/vcl/inc/vcl/decoview.hxx index b6b6f0f09e94..40bdb2c74a29 100644 --- a/vcl/inc/vcl/decoview.hxx +++ b/vcl/inc/vcl/decoview.hxx @@ -53,6 +53,7 @@ class OutputDevice; #define FRAME_DRAW_DOUBLEIN ((sal_uInt16)0x0004) #define FRAME_DRAW_DOUBLEOUT ((sal_uInt16)0x0005) #define FRAME_DRAW_TOPBOTTOM ((sal_uInt16)0x0006) +#define FRAME_DRAW_NWF ((sal_uInt16)0x0007) #define FRAME_DRAW_MENU ((sal_uInt16)0x0010) #define FRAME_DRAW_WINDOWBORDER ((sal_uInt16)0x0020) #define FRAME_DRAW_BORDERWINDOWBORDER ((sal_uInt16)0x0040) diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx index 65118ca16520..eaa90d99392d 100644 --- a/vcl/inc/vcl/window.hxx +++ b/vcl/inc/vcl/window.hxx @@ -293,6 +293,7 @@ typedef sal_uInt16 StateChangedType; #define WINDOW_BORDER_DOUBLEOUT ((sal_uInt16)0x0008) #define WINDOW_BORDER_MENU ((sal_uInt16)0x0010) #define WINDOW_BORDER_TOPBOTTOM ((sal_uInt16)0x0020) +#define WINDOW_BORDER_NWF ((sal_uInt16)0x0040) #define WINDOW_BORDER_NOBORDER ((sal_uInt16)0x1000) #define WINDOW_BORDER_REMOVEBORDER ((sal_uInt16)0x2000) diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index 9d397c2de7d7..601a6147b742 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -1201,6 +1201,8 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHei nStyle |= FRAME_DRAW_DOUBLEOUT; else if ( nBorderStyle & WINDOW_BORDER_TOPBOTTOM ) nStyle |= FRAME_DRAW_TOPBOTTOM; + else if ( nBorderStyle & WINDOW_BORDER_NWF ) + nStyle |= FRAME_DRAW_NWF; else nStyle |= FRAME_DRAW_DOUBLEIN; if ( nBorderStyle & WINDOW_BORDER_MONO ) @@ -1392,6 +1394,8 @@ void ImplSmallBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* nStyle |= FRAME_DRAW_DOUBLEOUT; else if ( nBorderStyle & WINDOW_BORDER_TOPBOTTOM ) nStyle |= FRAME_DRAW_TOPBOTTOM; + else if ( nBorderStyle & WINDOW_BORDER_NWF ) + nStyle |= FRAME_DRAW_NWF; else nStyle |= FRAME_DRAW_DOUBLEIN; if ( nBorderStyle & WINDOW_BORDER_MONO ) diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx index 878578df7724..20546e5e3dd0 100644 --- a/vcl/source/window/decoview.cxx +++ b/vcl/source/window/decoview.cxx @@ -739,6 +739,14 @@ void ImplDrawFrame( OutputDevice *const pDev, Rectangle& rRect, ++rRect.Top(); --rRect.Bottom(); break; + + case FRAME_DRAW_NWF: + // enough space for the native rendering + rRect.Left() += 5; + rRect.Top() += 5; + rRect.Right() -= 5; + rRect.Bottom() -= 5; + break; } } else @@ -830,6 +838,14 @@ void ImplDrawFrame( OutputDevice *const pDev, Rectangle& rRect, ++rRect.Top(); --rRect.Bottom(); break; + + case FRAME_DRAW_NWF: + // no rendering, just enough space for the native rendering + rRect.Left() += 5; + rRect.Top() += 5; + rRect.Right() -= 5; + rRect.Bottom() -= 5; + break; } } } |