diff options
| -rw-r--r-- | solenv/clang-format/excludelist | 1 | ||||
| -rw-r--r-- | vcl/Library_vcl.mk | 1 | ||||
| -rw-r--r-- | vcl/source/outdev/background.cxx | 73 | ||||
| -rw-r--r-- | vcl/source/outdev/outdevstate.cxx | 45 | ||||
| -rw-r--r-- | vcl/source/outdev/wallpaper.cxx | 11 |
5 files changed, 77 insertions, 54 deletions
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index c2cc51592e42..f6c57e5785fc 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -15028,6 +15028,7 @@ vcl/source/opengl/win/WinDeviceInfo.cxx vcl/source/opengl/win/context.cxx vcl/source/opengl/x11/X11DeviceInfo.cxx vcl/source/opengl/x11/context.cxx +vcl/source/outdev/background.cxx vcl/source/outdev/bitmap.cxx vcl/source/outdev/clipping.cxx vcl/source/outdev/curvedshapes.cxx diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 9fb2e352bdea..c7a0e5c48986 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -211,6 +211,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/edit/xtextedt \ vcl/source/toolkit/group \ vcl/source/toolkit/morebtn \ + vcl/source/outdev/background \ vcl/source/outdev/outdev \ vcl/source/outdev/outdevstate \ vcl/source/outdev/clipping \ diff --git a/vcl/source/outdev/background.cxx b/vcl/source/outdev/background.cxx new file mode 100644 index 000000000000..6bcb3fdeb6c5 --- /dev/null +++ b/vcl/source/outdev/background.cxx @@ -0,0 +1,73 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#include <vcl/virdev.hxx> + +Color OutputDevice::GetBackgroundColor() const +{ + return GetBackground().GetColor(); +} + +void OutputDevice::SetBackground() +{ + + maBackground = Wallpaper(); + mbBackground = false; + + if( mpAlphaVDev ) + mpAlphaVDev->SetBackground(); +} + +void OutputDevice::SetBackground( const Wallpaper& rBackground ) +{ + + maBackground = rBackground; + + if( rBackground.GetStyle() == WallpaperStyle::NONE ) + mbBackground = false; + else + mbBackground = true; + + if( mpAlphaVDev ) + { + // Some of these are probably wrong (e.g. if the gradient has transparency), + // but hopefully nobody uses that. If you do, feel free to implement it properly. + if( rBackground.GetStyle() == WallpaperStyle::NONE ) + mpAlphaVDev->SetBackground( rBackground ); + else if( rBackground.IsBitmap()) + { + BitmapEx bitmap = rBackground.GetBitmap(); + if( bitmap.IsAlpha()) + mpAlphaVDev->SetBackground( Wallpaper( BitmapEx( Bitmap( bitmap.GetAlpha())))); + else + mpAlphaVDev->SetBackground( Wallpaper( COL_BLACK )); + } + else if( rBackground.IsGradient()) + mpAlphaVDev->SetBackground( Wallpaper( COL_BLACK )); + else + { + // Color background. + int transparency = 255 - rBackground.GetColor().GetAlpha(); + mpAlphaVDev->SetBackground( Wallpaper( Color( transparency, transparency, transparency ))); + } + } +} + + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/vcl/source/outdev/outdevstate.cxx b/vcl/source/outdev/outdevstate.cxx index 7fa966606744..c50349cc1f30 100644 --- a/vcl/source/outdev/outdevstate.cxx +++ b/vcl/source/outdev/outdevstate.cxx @@ -436,51 +436,6 @@ void OutputDevice::SetLineColor( const Color& rColor ) mpAlphaVDev->SetLineColor( COL_BLACK ); } -void OutputDevice::SetBackground() -{ - - maBackground = Wallpaper(); - mbBackground = false; - - if( mpAlphaVDev ) - mpAlphaVDev->SetBackground(); -} - -void OutputDevice::SetBackground( const Wallpaper& rBackground ) -{ - - maBackground = rBackground; - - if( rBackground.GetStyle() == WallpaperStyle::NONE ) - mbBackground = false; - else - mbBackground = true; - - if( mpAlphaVDev ) - { - // Some of these are probably wrong (e.g. if the gradient has transparency), - // but hopefully nobody uses that. If you do, feel free to implement it properly. - if( rBackground.GetStyle() == WallpaperStyle::NONE ) - mpAlphaVDev->SetBackground( rBackground ); - else if( rBackground.IsBitmap()) - { - BitmapEx bitmap = rBackground.GetBitmap(); - if( bitmap.IsAlpha()) - mpAlphaVDev->SetBackground( Wallpaper( BitmapEx( Bitmap( bitmap.GetAlpha())))); - else - mpAlphaVDev->SetBackground( Wallpaper( COL_BLACK )); - } - else if( rBackground.IsGradient()) - mpAlphaVDev->SetBackground( Wallpaper( COL_BLACK )); - else - { - // Color background. - int transparency = 255 - rBackground.GetColor().GetAlpha(); - mpAlphaVDev->SetBackground( Wallpaper( Color( transparency, transparency, transparency ))); - } - } -} - void OutputDevice::SetFont( const vcl::Font& rNewFont ) { diff --git a/vcl/source/outdev/wallpaper.cxx b/vcl/source/outdev/wallpaper.cxx index 37f3b0c1bcd1..2223eba4c6a2 100644 --- a/vcl/source/outdev/wallpaper.cxx +++ b/vcl/source/outdev/wallpaper.cxx @@ -17,13 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <cassert> - -#include <vcl/gdimtf.hxx> #include <vcl/metaact.hxx> -#include <vcl/outdev.hxx> #include <vcl/virdev.hxx> +#include <cassert> + Color OutputDevice::GetReadableFontColor(const Color& rFontColor, const Color& rBgColor) const { if (rBgColor.IsDark() && rFontColor.IsDark()) @@ -34,11 +32,6 @@ Color OutputDevice::GetReadableFontColor(const Color& rFontColor, const Color& r return rFontColor; } -Color OutputDevice::GetBackgroundColor() const -{ - return GetBackground().GetColor(); -} - void OutputDevice::DrawWallpaper( const tools::Rectangle& rRect, const Wallpaper& rWallpaper ) { |