From 4a517e06b64c28f6f3e74a91ad0eca975615ebdc Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Fri, 5 Aug 2011 14:24:41 +0200 Subject: [PATCH] #394 - Separate graphic for "Mouse Over" for main-menu buttons and Icons --- planet/Graphics.ocg/GUIButtonHighlightRound.png | Bin 0 -> 1158 bytes src/c4group/C4Components.h | 15 ++++++--------- src/gui/C4GuiButton.cpp | 6 +++--- src/gui/C4GuiCheckBox.cpp | 2 +- src/gui/C4GuiComboBox.cpp | 2 +- src/gui/C4GuiTabular.cpp | 2 +- src/lib/texture/C4GraphicsResource.cpp | 2 ++ src/lib/texture/C4GraphicsResource.h | 1 + 8 files changed, 15 insertions(+), 15 deletions(-) create mode 100644 planet/Graphics.ocg/GUIButtonHighlightRound.png diff --git a/planet/Graphics.ocg/GUIButtonHighlightRound.png b/planet/Graphics.ocg/GUIButtonHighlightRound.png new file mode 100644 index 0000000000000000000000000000000000000000..eebdf313c41d18a1b00305188bd0d720f8f02181 GIT binary patch literal 1158 zcmV;11bO?3P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iph* z3<$rAYQT$Dw}6vF1R2CxE+9d519*3c zm{J2yfWP090!IqGM?^ISSitqYCg=x=6%ud)JUYOw^BDwqrx_Lm_bZC4JS7RT z?J@~1i4Pfgiv(@?5%8eEO3*CY?gn^$^vc|#6?1y+?-l{t`ZM4o5?J_pHKpznxTS)Y zNS~DTkAwg$_-@Z|?3 zL&_&vdn6vDbLy{FfVJYnABc?$xc(GC#u^#~pM9DtQd~6i(B^U<>OVOR@rTBP$nUL^ zo5uoz1-eq1u_O4Q{!{R9FM#I_~M$c9K<*fkq(pHZh->?diH9dF_$)bquinq{F!u$693} zV;;Uz4HfVa3GPVHBqN3jJQ6BX>lJE!Nf(U%J2FC-dOFZcFH{(ow z-y}e&Ko%JhoGY%pVTgh?1{@qMxL|pYfSZ@ahDB0IK#Z)XRU>y|cw&Tzz_a1&5pYxb zkqdZI?7{C2I2R?zEvXR_Ebu+Bes}zzE9)300fsAR60C9*uQ2IqsjNr9Z6xXsmC6=L zke$>DkcA1A^0_S9XG30}0iU@*RSE2Xe`UEm&wwwF&tLt*ghPTJ^RriGqIU+Og^fL4 znK4KJ__mj(3TgoO?XS%xY5@3_7bgdZ$Udu1eqc55Wdt}xWPpFq%hLrSR!xVO0>2;s Y00m%(w7zhftpET307*qoM6N<$f`{b$Bme*a literal 0 HcmV?d00001 diff --git a/src/c4group/C4Components.h b/src/c4group/C4Components.h index 51f8599fd..13b74d6cb 100644 --- a/src/c4group/C4Components.h +++ b/src/c4group/C4Components.h @@ -96,9 +96,6 @@ #define C4CFN_ClrByOwnerExPNG "Overlay*.png" #define C4CFN_DefDesc "Desc%s.txt" #define C4CFN_BigIcon "BigIcon.png" -#define C4CFN_Portrait "Portrait.png" -#define C4CFN_PortraitOverlay "PortraitOverlay.png" -#define C4CFN_Portraits "Portrait*.*" #define C4CFN_UpperBoard "UpperBoard" #define C4CFN_Logo "Logo" #define C4CFN_MoreMusic "MoreMusic.txt" @@ -175,14 +172,14 @@ #define C4FLS_Section "Scenario.txt|Game.txt|Landscape.bmp|Landscape.png|Sky.bmp|Sky.png|Sky.jpeg|Sky.jpg|PXS.ocb|MassMover.ocb|CtrlRec.ocb|Strings.txt|Objects.txt" #define C4FLS_SectionLandscape "Scenario.txt|Landscape.bmp|Landscape.png|PXS.ocb|MassMover.ocb" #define C4FLS_SectionObjects "Strings.txt|Objects.txt" -#define C4FLS_Def "Particle.txt|DefCore.txt|Graphics.png|Overlay.png|Graphics*.png|Overlay*.png|Portrait*.png|StringTbl*.txt|Script.c|Script*.c|C4Script.c|Names*.txt|Title*.txt|ClonkNames.txt|Rank.txt|Rank.png|Desc*.txt|Overlay.png|Title.png|Icon.bmp|Author.txt|Version.txt|*.wav|*.ocd" -#define C4FLS_Player "Player.txt|Portrait.png|Portrait.bmp|*.oci" -#define C4FLS_Object "ObjectInfo.txt|Portrait.png|Portrait.bmp" +#define C4FLS_Def "Particle.txt|DefCore.txt|Graphics.png|Overlay.png|Graphics*.png|Overlay*.png|StringTbl*.txt|Script.c|Script*.c|C4Script.c|Names*.txt|Title*.txt|ClonkNames.txt|Rank.txt|Rank.png|Desc*.txt|Overlay.png|Title.png|Icon.bmp|Author.txt|Version.txt|*.wav|*.ocd" +#define C4FLS_Player "Player.txt|*.oci" +#define C4FLS_Object "ObjectInfo.txt" #define C4FLS_Folder "Folder.txt|Title*.txt|Info.txt|Desc*.rtf|Title.png|Title.bmp|Icon.png|Icon.bmp|Author.txt|Version.txt|*.ocs|Loader*.bmp|Loader*.png|Loader*.jpeg|Loader*.jpg|FolderMap.txt|FolderMap.png" #define C4FLS_Material "TexMap.txt|*.bmp|*.png|*.ocm" -#define C4FLS_Graphics "Loader*.bmp|Loader*.png|Loader*.jpeg|Loader*.jpg|FontEndeavour12.png|FontEndeavour24.png|FontEndeavour16.png|FontEndeavour10.png|Font*.png"\ - "|*.pal|Control.png|Fire.png|Background.png|Flag.png|Crew.png|Wealth.png|Player.png|Rank.png|Entry.png|Captain.png|Cursor.png|CursorSmall.png|CursorMedium.png|CursorLarge.png|SelectMark.png|MenuSymbol.png|Menu.png|Logo.png|Construction.png|Energy.png|Options.png|UpperBoard.png|Arrow.png|Exit.png|Hand.png|Gamepad.png|Build.png|Liquid.png"\ - "|GUICaption.png|GUIButton.png|GUIButtonDown.png|GUIButtonHighlight.png|GUIIcons.png|GUIIcons2.png|GUIScroll.png|GUIContext.png|GUISubmenu.png|GUICheckBox.png|GUIBigArrows.png|GUIProgress.png"\ +#define C4FLS_Graphics "Loader*.bmp|Loader*.png|Loader*.jpeg|Loader*.jpg|Font*.png"\ + "|*.pal|Control.png|Fire.png|Background.png|Flag.png|Crew.png|Wealth.png|Player.png|Rank.png|Captain.png|Cursor.png|CursorSmall.png|CursorMedium.png|CursorLarge.png|SelectMark.png|MenuSymbol.png|Menu.png|Logo.png|Construction.png|Energy.png|Options.png|UpperBoard.png|Arrow.png|Exit.png|Hand.png|Gamepad.png|Build.png|Liquid.png"\ + "|GUICaption.png|GUIButton.png|GUIButtonDown.png|GUIButtonHighlight.png|GUIButtonHighlightRound.png|GUIIcons.png|GUIIcons2.png|GUIScroll.png|GUIContext.png|GUISubmenu.png|GUICheckBox.png|GUIBigArrows.png|GUIProgress.png"\ "|StartupScenSelBG.*|StartupPlrSelBG.*|StartupPlrPropBG.*|StartupNetworkBG.*|StartupAboutBG.*|StartupBigButton.png|StartupBigButtonDown.png|StartupBookScroll.png|StartupContext.png|StartupScenSelIcons.png|StartupScenSelTitleOv.png|StartupDlgPaper.png|StartupOptionIcons.png|StartupTabClip.png|StartupNetGetRef.png|StartupLogo.png" #define C4FLS_Objects "Names*.txt|Desc*.txt|*.ocd" #define C4FLS_System "*.hlp|*.cnt|Language*.txt|*.fon|*.fnt|*.ttf|*.ttc|*.fot|*.otf|Fonts.txt|StringTbl*.txt|*.c|Names.txt" diff --git a/src/gui/C4GuiButton.cpp b/src/gui/C4GuiButton.cpp index 2b153c20b..cdf014091 100644 --- a/src/gui/C4GuiButton.cpp +++ b/src/gui/C4GuiButton.cpp @@ -221,7 +221,7 @@ namespace C4GUI if (fEnabled) if (fHighlight || HasDrawFocus() || (fMouseOver && IsInActiveDlg(false))) { lpDDraw->SetBlitMode(C4GFXBLIT_ADDITIVE); - ::GraphicsResource.fctButtonHighlight.DrawX(cgo.Surface, x0, y0, rcBounds.Wdt, rcBounds.Hgt); + ::GraphicsResource.fctButtonHighlightRound.DrawX(cgo.Surface, x0, y0, rcBounds.Wdt, rcBounds.Hgt); lpDDraw->ResetBlitMode(); } // draw the icon @@ -231,7 +231,7 @@ namespace C4GUI if (fEnabled) if (fDown || fHighlight) { lpDDraw->SetBlitMode(C4GFXBLIT_ADDITIVE); - ::GraphicsResource.fctButtonHighlight.DrawX(cgo.Surface, x0, y0, rcBounds.Wdt, rcBounds.Hgt); + ::GraphicsResource.fctButtonHighlightRound.DrawX(cgo.Surface, x0, y0, rcBounds.Wdt, rcBounds.Hgt); lpDDraw->ResetBlitMode(); } // some icon buttons have captions. draw caption below button @@ -275,7 +275,7 @@ namespace C4GUI if (fEnabled) if (HasDrawFocus() || (fMouseOver && IsInActiveDlg(false))) { lpDDraw->SetBlitMode(C4GFXBLIT_ADDITIVE); - ::GraphicsResource.fctButtonHighlight.DrawX(cgo.Surface, x0, y0, rcBounds.Wdt, rcBounds.Hgt); + ::GraphicsResource.fctButtonHighlightRound.DrawX(cgo.Surface, x0, y0, rcBounds.Wdt, rcBounds.Hgt); lpDDraw->ResetBlitMode(); } // draw the arrow - down if pressed diff --git a/src/gui/C4GuiCheckBox.cpp b/src/gui/C4GuiCheckBox.cpp index 0f0820174..d14300b8c 100644 --- a/src/gui/C4GuiCheckBox.cpp +++ b/src/gui/C4GuiCheckBox.cpp @@ -135,7 +135,7 @@ namespace C4GUI if ((fMouseOn && IsInActiveDlg(false)) || HasDrawFocus()) { lpDDraw->SetBlitMode(C4GFXBLIT_ADDITIVE); - ::GraphicsResource.fctButtonHighlight.DrawX(cgo.Surface, x0+rcBounds.Hgt*1/4, y0+rcBounds.Hgt*1/4, rcBounds.Hgt*1/2, rcBounds.Hgt*1/2); + ::GraphicsResource.fctButtonHighlightRound.DrawX(cgo.Surface, x0+rcBounds.Hgt*1/4, y0+rcBounds.Hgt*1/4, rcBounds.Hgt*1/2, rcBounds.Hgt*1/2); lpDDraw->ResetBlitMode(); } } diff --git a/src/gui/C4GuiComboBox.cpp b/src/gui/C4GuiComboBox.cpp index b64596e6f..0a17c6ba2 100644 --- a/src/gui/C4GuiComboBox.cpp +++ b/src/gui/C4GuiComboBox.cpp @@ -186,7 +186,7 @@ namespace C4GUI if ((HasDrawFocus() || iOpenMenu || fMouseOver) && !fReadOnly) { lpDDraw->SetBlitMode(C4GFXBLIT_ADDITIVE); - ::GraphicsResource.fctButtonHighlight.DrawX(cgo.Surface, x0, y0, rcBounds.Wdt, rcBounds.Hgt); + ::GraphicsResource.fctButtonHighlightRound.DrawX(cgo.Surface, x0, y0, rcBounds.Wdt, rcBounds.Hgt); lpDDraw->ResetBlitMode(); } } diff --git a/src/gui/C4GuiTabular.cpp b/src/gui/C4GuiTabular.cpp index cfc52d2d6..30cfaccbb 100644 --- a/src/gui/C4GuiTabular.cpp +++ b/src/gui/C4GuiTabular.cpp @@ -74,7 +74,7 @@ namespace C4GUI if (fFocus) { lpDDraw->SetBlitMode(C4GFXBLIT_ADDITIVE); - ::GraphicsResource.fctButtonHighlight.DrawX(cgo.Surface, (fLarge ? x : x - iTxtWdt/2)+5, y+3, (fLarge ? iMaxWdt : iTxtWdt)-10, iTxtHgt-6); + ::GraphicsResource.fctButtonHighlightRound.DrawX(cgo.Surface, (fLarge ? x : x - iTxtWdt/2)+5, y+3, (fLarge ? iMaxWdt : iTxtWdt)-10, iTxtHgt-6); lpDDraw->ResetBlitMode(); } if (!(pfctClip && pfctIcon)) diff --git a/src/lib/texture/C4GraphicsResource.cpp b/src/lib/texture/C4GraphicsResource.cpp index a2d241f70..79308d6d4 100644 --- a/src/lib/texture/C4GraphicsResource.cpp +++ b/src/lib/texture/C4GraphicsResource.cpp @@ -128,6 +128,7 @@ void C4GraphicsResource::Clear() idSfcCaption = idSfcButton = idSfcButtonD = idSfcScroll = idSfcContext = 0; barCaption.Clear(); barButton.Clear(); barButtonD.Clear(); fctButtonHighlight.Clear(); fctIcons.Clear(); fctIconsEx.Clear(); + fctButtonHighlightRound.Clear(); fctSubmenu.Clear(); fctCheckbox.Clear(); fctBigArrows.Clear(); @@ -200,6 +201,7 @@ bool C4GraphicsResource::Init() if (!LoadFile(sfcButtonD, "GUIButtonDown", Files, idSfcButtonD)) return false; barButtonD.SetHorizontal(sfcButtonD); if (!LoadFile(fctButtonHighlight, "GUIButtonHighlight", Files)) return false; + if (!LoadFile(fctButtonHighlightRound, "GUIButtonHighlightRound", Files)) return false; if (!LoadFile(fctIcons, "GUIIcons", Files)) return false; fctIcons.Set(fctIcons.Surface,0,0,C4GUI_IconWdt,C4GUI_IconHgt); if (!LoadFile(fctIconsEx, "GUIIcons2", Files)) return false; diff --git a/src/lib/texture/C4GraphicsResource.h b/src/lib/texture/C4GraphicsResource.h index 29372e965..3550929c7 100644 --- a/src/lib/texture/C4GraphicsResource.h +++ b/src/lib/texture/C4GraphicsResource.h @@ -83,6 +83,7 @@ public: C4GUI::DynBarFacet barCaption, barButton, barButtonD; C4FacetID fctButtonHighlight; + C4FacetID fctButtonHighlightRound; C4FacetID fctIcons, fctIconsEx; C4FacetID fctSubmenu; C4FacetID fctCheckbox;