Menu
▾
▴
[Dcplusplus-commit] SF.net SVN: dcplusplus: [1094] dcplusplus/trunk
|
From: <arn...@us...> - 2008-03-30 08:32:24
|
Revision: 1094
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1094&view=rev
Author: arnetheduck
Date: 2008-03-30 01:32:18 -0700 (Sun, 30 Mar 2008)
Log Message:
-----------
don't use COLOR_MENUBAR which is for > XP, and normalize other menu colors
Modified Paths:
--------------
dcplusplus/trunk/changelog.txt
dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetMenu.h
dcplusplus/trunk/smartwin/source/widgets/WidgetMenu.cpp
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-03-29 17:27:03.002000093 +0100
committer: zouzou123gen
properties:
branch-nick: bzr
+ timestamp: 2008-03-30 00:47:06.986000061 +0100
committer: zouzou123gen
properties:
branch-nick: bzr
Name: bzr:revision-id:v3-trunk1
- 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn
1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn
1029 zouzou123gen-20080323221249-0su72zaj13e706mk
1030 arn...@gm...-20080324140623-muba1dl46m000o8c
1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6
1032 arn...@gm...-20080324153706-siidja05n84i00b1
1033 arn...@gm...-20080324153823-lhn3awurnu77riln
1034 arn...@gm...-20080324165650-zapppziji67yf5a2
1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2
1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3
1037 arn...@gm...-20080325100659-8fqy6q65itmghlep
1038 zouzou123gen-20080325175216-s297sdiucukfvijh
1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087
1040 arn...@gm...-20080325211747-nwwy1eb33r071sca
1041 arn...@gm...-20080326084110-qbselrjckku275xi
1042 zouzou123gen-20080326123631-35642mgbk2i4ty32
1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r
1044 arn...@gm...-20080326162031-il0nyms30w0mky43
1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv
1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g
1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv
1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q
1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz
1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf
1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd
1052 arn...@gm...-20080327120639-um3tukdt374rwvgm
1053 zouzou123gen-20080327130703-6vtek6uxy3vua543
1054 arn...@gm...-20080327215831-dmg5mkufskabwkro
1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf
1056 arn...@gm...-20080328085925-gceybsr53oml1p24
1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a
1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o
1059 arn...@gm...-20080329055630-braiir1dskv7a4qm
1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja
1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl
1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0
1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd
1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp
1065 arn...@gm...-20080329124926-2je1z18p0272zpua
1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp
1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r
1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5
+ 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn
1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn
1029 zouzou123gen-20080323221249-0su72zaj13e706mk
1030 arn...@gm...-20080324140623-muba1dl46m000o8c
1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6
1032 arn...@gm...-20080324153706-siidja05n84i00b1
1033 arn...@gm...-20080324153823-lhn3awurnu77riln
1034 arn...@gm...-20080324165650-zapppziji67yf5a2
1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2
1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3
1037 arn...@gm...-20080325100659-8fqy6q65itmghlep
1038 zouzou123gen-20080325175216-s297sdiucukfvijh
1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087
1040 arn...@gm...-20080325211747-nwwy1eb33r071sca
1041 arn...@gm...-20080326084110-qbselrjckku275xi
1042 zouzou123gen-20080326123631-35642mgbk2i4ty32
1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r
1044 arn...@gm...-20080326162031-il0nyms30w0mky43
1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv
1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g
1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv
1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q
1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz
1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf
1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd
1052 arn...@gm...-20080327120639-um3tukdt374rwvgm
1053 zouzou123gen-20080327130703-6vtek6uxy3vua543
1054 arn...@gm...-20080327215831-dmg5mkufskabwkro
1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf
1056 arn...@gm...-20080328085925-gceybsr53oml1p24
1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a
1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o
1059 arn...@gm...-20080329055630-braiir1dskv7a4qm
1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja
1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl
1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0
1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd
1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp
1065 arn...@gm...-20080329124926-2je1z18p0272zpua
1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp
1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r
1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5
1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql
Modified: dcplusplus/trunk/changelog.txt
===================================================================
--- dcplusplus/trunk/changelog.txt 2008-03-30 08:31:52 UTC (rev 1093)
+++ dcplusplus/trunk/changelog.txt 2008-03-30 08:32:18 UTC (rev 1094)
@@ -13,6 +13,7 @@
* Add average share to status bar (thanks mikejj)
* Minor improvements to load / save dialogs
* [L#208684] Fixed line history when "Use Ctrl ..." is disabled (poy)
+* [L#208917] Fixed menu background colors (poy)
-- 0.705 2008-03-14 --
* Several patches for better *nix compatibility of the core (thanks steven sheehy et al)
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetMenu.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetMenu.h 2008-03-30 08:31:52 UTC (rev 1093)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetMenu.h 2008-03-30 08:32:18 UTC (rev 1094)
@@ -85,9 +85,6 @@
/// Strip bar color
COLORREF colorStrip;
- /// Menu bar color
- COLORREF colorMenuBar;
-
/// Highlighted menu item color
COLORREF colorHighlight;
@@ -104,13 +101,11 @@
*/
MenuColorInfo( COLORREF menuColor = ColorUtilities::darkenColor( ::GetSysColor( COLOR_WINDOW ), 0.02 ),
COLORREF stripColor = ColorUtilities::darkenColor( ::GetSysColor( COLOR_3DFACE ), 0.02 ),
- COLORREF menuBarColor = ::GetSysColor( COLOR_MENUBAR ),
COLORREF highlightColor = ::GetSysColor( COLOR_HIGHLIGHT ),
COLORREF titleTextColor = ::GetSysColor( COLOR_MENUTEXT ),
COLORREF imageBackground = RGB( 0, 0, 0 ) ) // black
: colorMenu( menuColor ),
colorStrip( stripColor ),
- colorMenuBar( menuBarColor ),
colorHighlight( highlightColor ),
colorTitleText( titleTextColor ),
colorImageBackground( imageBackground )
Modified: dcplusplus/trunk/smartwin/source/widgets/WidgetMenu.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/WidgetMenu.cpp 2008-03-30 08:31:52 UTC (rev 1093)
+++ dcplusplus/trunk/smartwin/source/widgets/WidgetMenu.cpp 2008-03-30 08:32:18 UTC (rev 1094)
@@ -387,19 +387,9 @@
ItemDataWrapper * wrapper = reinterpret_cast< ItemDataWrapper * >( drawInfo->itemData );
xAssert( wrapper != 0, _T( "Unsupported menu item in drawItem()" ) );
- // setup colors
- MenuColorInfo colorInfo = wrapper->menu->itsColorInfo;
- COLORREF colorMenuBar = colorInfo.colorMenuBar;
- COLORREF colorMenuDraw = colorInfo.colorMenu; // color for drawing menu
- COLORREF colorFillHighlighted = ColorUtilities::lightenColor( colorInfo.colorHighlight, 0.7 );
-
// if processing menu bar
const bool isMenuBar = ::GetMenu( wrapper->menu->getParent()->handle() ) == wrapper->menu->handle();
- // change menu draw color for menubars
- if ( isMenuBar )
- colorMenuDraw = colorMenuBar;
-
// init struct for menu item info
MENUITEMINFO info;
memset( & info, 0, sizeof( MENUITEMINFO ) );
@@ -493,6 +483,8 @@
itemRectangle.size.x -= sidebarWidth;
}
+ const MenuColorInfo& colorInfo = wrapper->menu->itsColorInfo;
+
// draw sidebar with menu title
if ( ( drawInfo->itemAction & ODA_DRAWENTIRE ) && ( wrapper->menu->drawSidebar ) && !wrapper->menu->itsTitle.empty() )
{
@@ -512,7 +504,7 @@
Rectangle textRectangle( 0, 0, sidebarWidth, rect.bottom - rect.top );
// draw background
- Brush brush ( colorInfo.colorMenuBar );
+ Brush brush ( colorInfo.colorStrip );
canvas.fillRectangle( textRectangle, brush );
// draw title
@@ -531,20 +523,10 @@
::DeleteObject( titleFont );
// set item background
- if ( wrapper->isMenuTitleItem ) // for title
{
- Brush brush ( colorMenuBar );
- canvas.fillRectangle( itemRectangle, brush );
-
- // draw raised border
- RECT rc( itemRectangle );
- ::DrawEdge( canvas.handle(), & rc, EDGE_RAISED, BF_RECT );
+ Brush brush((wrapper->isMenuTitleItem || isMenuBar) ? colorInfo.colorStrip : colorInfo.colorMenu);
+ canvas.fillRectangle(itemRectangle, brush);
}
- else // for normal items
- {
- Brush brush ( colorMenuDraw );
- canvas.fillRectangle( itemRectangle, brush );
- }
if ( isMenuBar && isSelected ) // draw selected menu bar item
{
@@ -554,8 +536,6 @@
// and brush for filling item
COLORREF colorBorder = 0;
Canvas::Selector select_pen(canvas, *PenPtr(new Pen(colorBorder)));
- Canvas::Selector select_brush(canvas, *BrushPtr(new Brush(ColorUtilities::lightenColor( colorMenuBar, 0.5 ))));
-
canvas.rectangle( itemRectangle );
} // end if
else if ( ( isSelected || isHighlighted ) && !isDisabled ) // draw selected or highlighted menu item (if not inactive)
@@ -563,7 +543,7 @@
// select pen for drawing broder
// and brush for filling item
Canvas::Selector select_pen(canvas, *PenPtr(new Pen(colorInfo.colorHighlight)));
- Canvas::Selector select_brush(canvas, *BrushPtr(new Brush(colorFillHighlighted)));
+ Canvas::Selector select_brush(canvas, *BrushPtr(new Brush(ColorUtilities::lightenColor( colorInfo.colorHighlight, 0.7 ))));
canvas.rectangle( itemRectangle );
} // end if
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
