From cc2600100c8d6b5ea65a1c5570aa41062dd0765c Mon Sep 17 00:00:00 2001 From: Rivo Laks Date: Fri, 24 Aug 2007 15:44:52 +0000 Subject: [PATCH] Add a method to render round box with a dark edge and use it for alt-tab's frame. Now the frame has a slight edge/border around it which makes it look much better IMHO. svn path=/trunk/KDE/kdebase/workspace/; revision=704310 --- effects/CMakeLists.txt | 1 + effects/data/circle-edgy.png | Bin 0 -> 2725 bytes lib/kwinglutils.cpp | 11 +++++++++++ lib/kwinglutils.h | 1 + 4 files changed, 13 insertions(+) create mode 100644 effects/data/circle-edgy.png diff --git a/effects/CMakeLists.txt b/effects/CMakeLists.txt index 5a6b43aa1c..103f28a24f 100644 --- a/effects/CMakeLists.txt +++ b/effects/CMakeLists.txt @@ -95,6 +95,7 @@ if(OPENGL_FOUND) data/lookingglass.vert data/shadow-texture.png data/circle.png + data/circle-edgy.png DESTINATION ${DATA_INSTALL_DIR}/kwin ) # config modules diff --git a/effects/data/circle-edgy.png b/effects/data/circle-edgy.png new file mode 100644 index 0000000000000000000000000000000000000000..60f67b12be7c015cb84db32abee6a7578645571c GIT binary patch literal 2725 zcmV;W3R?AvP)OS3HC*rX{b`V8<0^@K-Ky zg@c70`Hd5W9P^ELe(mx1b6DXr0C1$3uS_^9yN z3B@>GS`?obk*Ed!+xe$iVyVIh9+@7On5G-Y`yZVn+%Mngjn&tE05L1R*EX-b1NJKb zkdp5;)x!W#b_3AS^Su^%9DvRe0HmIB()k(RYAE4?1_VF>3?L2UfeO$By1)pS0ZU*D zoPay<2L2!fYy=z-3z7gIWP%*93*>`BPy!BuDo_g=Koe*MXFw-74=#gi;1;+GM!;hr z08`*4mLATmjd^ zr{E6wGJFdjfd%kOcmV+j5n&=qh%UlL91w3L6p2Ro$abUvDM#v&R-_y0NA4j4WDfa& z!l39VMU*be66J~tKygqhsO_jCR2AwZssq)Bx`&!T&7;1c$!Hc@2W^3NLkFW{(3$9b zbUC^a-HyJB9zjo`-(fHqCPo8ehH=G&VB#^^m?F$!OdIABW(YHhS-@hk(pVj=71kRY zflb5aV=J+zuotnz*eUFL91*90Gr~FJLUBA?F0LHcjO)P-yh4!Y)Dup_OozFiv+K#=^^P2nM_tE+mb`cY2XMzN!8q-0UbDQ78nD05UiRh{ZUji7F)R#VSW$EXY9ba6v*Z}BAYBJpPN z8{#uGEKQx}MB~!(Xvb(*Xp?k=u0nU9bLhM24fLz@DF%k2!Ej^5GYT0$GX@#+5;O^8 zi9m@h64eqHBm_)^sm^p`CNhheXPBeRkCJkdc9Kz&dnH>Xhb0%KWTkASqNEC>+N4IL zK1wS}J4q)<@0aeBejv zRViJmPH9kSNm)ZVKsi^rP5FrmL4~antx~4at1_>upz5WXquQeSNDZ&XR*O|Tq}H#t zsIH+Nq`pVJQ+-B5O2bVfOQS_&T$8M6qnV;vuX$e!qs7)r&^oMjR~yzg(T>%w*1n?y z>zL}q=^WM>T7_O^zKXZ1e$|*RN!Ly{L$^hDLXWBEsh6wQsrO1>RXy`3DPAi!_Tf7JpglS|(UFTh6S} zSQE9TVa=qKvQ>mtot3~^(K_7vsI|aG$tJ?4-sYLDiY?c+(RSKS%P!vTl-(&Uf4w06tU@SI66Ei zygB?+gm*-J#6qN7WKHBe$ANQ*^O9@JE#uBcSw)pbO-EZrmqyRTSj8NOnT@rHEsvdx zbBL>odmZl@UmL%e;GJ+HVL34&)m9Xn}u0d{T?%Ul#ySww`@^KYwhG<(}FfQ9s80IJkH9-pajS3b+L~3k?d(3qKWcif;a7_*2DC%lo4D z4HlagA1T3<@JdGa+w4DCDqfmZI(fkBKu4KkSwY#`gPRWCC^s&zJw!N^en?Q^S{q&1p!hab(<8h|yW4-$ z`|ZSerSsJnBrX*95PI@@mM>;qT)32cY3_2&<;mVny^pU1U%B7s+c$XC&#e%s`B`=IGy#~rgfU3bmzb`Px?>KV2fzI@N| z-nIK~_iv4?9T^%87=17nHYRw$eK7Md@!{)78IP78?;J;u7d)XpDSyg(TK~J&?`;B8 z!G#IOiGgS9o;{xAOuqah^^Z?edC$qu%cm8ln`Vq=&d)l}-hHwD#nj8>mrHZ`e~SNE z^Gfs8uYcM8H83AMKlPgbdin37H_~rTyfuE?yWq3%^j*@srNx5x((g}xV1MZU81!*^ zDf1KdQ^jYk&)r`e>MP~w*jcE0zf?)07}?D0A$MpP^OZ4vH$=88G2M$bYXRL zXm4@=0C?I9$}G!Q@JY-r1^^I415ES$)u8|Y0J=#;K~y-)V`RV%q=483h?SuHdqBJg zh@YV=WW=JegOigp*5BWsL0w%PEO_(gO@@sdH!^(x{(Ui!TY=3W5U>GB)YsSl|N8ao ze{=v61Ia-(+hB9@vt`Sc{U-!KYM_QlAses=WIC|`>XJop+kt+@>TFy9q!y$Hq?ZX4 z+ModA;^JZ;7J$@(^nmn&3{ZlFHYotAM~R7nLI5)09w?qk1yDWrC=NubL?cxa64^^TIX?6wxoHKSV(Ht$600000NkvXXu0mjf_h}){ literal 0 HcmV?d00001 diff --git a/lib/kwinglutils.cpp b/lib/kwinglutils.cpp index c7855a7d4c..a2395b1e6d 100644 --- a/lib/kwinglutils.cpp +++ b/lib/kwinglutils.cpp @@ -320,6 +320,17 @@ void renderRoundBox( const QRect& area, float roundness, GLTexture* texture ) glPopAttrib(); } +void renderRoundBoxWithEdge( const QRect& area, float roundness ) +{ + static GLTexture* texture = 0; + if( !texture ) + { + QString texturefile = KGlobal::dirs()->findResource("data", "kwin/circle-edgy.png"); + texture = new GLTexture(texturefile); + } + renderRoundBox( area, roundness, texture ); +} + //**************************************** // GLTexture //**************************************** diff --git a/lib/kwinglutils.h b/lib/kwinglutils.h index c38f64cba6..ed9eab3ad0 100644 --- a/lib/kwinglutils.h +++ b/lib/kwinglutils.h @@ -92,6 +92,7 @@ KWIN_EXPORT void renderGLGeometryImmediate( int count, KWIN_EXPORT void renderRoundBox( const QRect& area, float roundness = 10.0f, GLTexture* texture = 0 ); +KWIN_EXPORT void renderRoundBoxWithEdge( const QRect& area, float roundness = 10.0f ); class KWIN_EXPORT GLTexture