MenuButton.cxx (b9e67834) MenuButton.cxx (95a18594)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 51 unchanged lines hidden (view full) ---

60 {
61 const bool bIsSelected (IsChecked());
62 const bool bIsMouseOver (IsMouseOver());
63 DrawHelper::DrawRoundedRectangle(
64 *this,
65 Rectangle(Point(0,0), GetSizePixel()),
66 2,
67 bIsMouseOver||bIsSelected ? Theme::GetColor(Theme::Color_TabItemBorder) : Color(0xffffffff),
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 51 unchanged lines hidden (view full) ---

60 {
61 const bool bIsSelected (IsChecked());
62 const bool bIsMouseOver (IsMouseOver());
63 DrawHelper::DrawRoundedRectangle(
64 *this,
65 Rectangle(Point(0,0), GetSizePixel()),
66 2,
67 bIsMouseOver||bIsSelected ? Theme::GetColor(Theme::Color_TabItemBorder) : Color(0xffffffff),
68 bIsMouseOver ? Theme::GetPaint(Theme::Paint_TabItemBackground) : sidebar::Paint());
68 bIsMouseOver
69 ? Theme::GetPaint(Theme::Paint_TabItemBackgroundHighlight)
70 : Theme::GetPaint(Theme::Paint_TabItemBackgroundNormal));
69
70 const Image aIcon (Button::GetModeImage(Theme::IsHighContrastMode()
71 ? BMP_COLOR_HIGHCONTRAST
72 : BMP_COLOR_NORMAL));
73 const Size aIconSize (aIcon.GetSizePixel());
74 const Point aIconLocation(
75 (GetSizePixel().Width() - aIconSize.Width())/2,
76 (GetSizePixel().Height() - aIconSize.Height())/2);

--- 73 unchanged lines hidden --- 		71
72 const Image aIcon (Button::GetModeImage(Theme::IsHighContrastMode()
73 ? BMP_COLOR_HIGHCONTRAST
74 : BMP_COLOR_NORMAL));
75 const Size aIconSize (aIcon.GetSizePixel());
76 const Point aIconLocation(
77 (GetSizePixel().Width() - aIconSize.Width())/2,
78 (GetSizePixel().Height() - aIconSize.Height())/2);

--- 73 unchanged lines hidden ---