I have made the following changes intended for : CE:UX:MTF / meegotouch-compositor
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/7895 Thank You, mharju [This message was auto-generated] --- Request # 7895: Messages from BOSS: State: review at 2013-02-14T13:46:04 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:mharju:branches:CE:UX:MTF / meegotouch-compositor -> CE:UX:MTF / meegotouch-compositor changes files: -------------- --- meegotouch-compositor.changes +++ meegotouch-compositor.changes @@ -0,0 +1,3 @@ +* Wed Feb 13 2013 Mikko Harju <[email protected]> - 1.2.2 +- Fix blending of transparent windows + old: ---- meegotouch-compositor-1.2.1.tar.bz2 new: ---- meegotouch-compositor-1.2.2.tar.bz2 spec files: ----------- --- meegotouch-compositor.spec +++ meegotouch-compositor.spec @@ -9,7 +9,7 @@ # << macros Summary: MeeGo UI Compositing Window Manager -Version: 1.2.1 +Version: 1.2.2 Release: 1 Group: System/Desktop License: LGPLv2.1 other changes: -------------- ++++++ meegotouch-compositor-1.2.1.tar.bz2 -> meegotouch-compositor-1.2.2.tar.bz2 --- meegotouch_config.pri +++ meegotouch_config.pri @@ -15,4 +15,4 @@ } # Compositor components only -VERSION = 1.1.3 +VERSION = 1.2.2 --- src/mtexturepixmapitem_p.cpp +++ src/mtexturepixmapitem_p.cpp @@ -307,10 +307,8 @@ { if (item->propertyCache()->hasAlphaAndIsNotOpaque() || item->opacity() < 1.0f) { - // Blend differently if fading in on the top of a splash screen. glEnable(GL_BLEND); - glBlendFunc(static_cast<MCompositeManager*>(qApp)->splashed(item) - ? GL_ONE : GL_SRC_ALPHA, + glBlendFunc(GL_ONE, // Correct for premultiplied-alpha textures GL_ONE_MINUS_SRC_ALPHA); } glBindTexture(GL_TEXTURE_2D, TFP.textureId); ++++++ meegotouch-compositor.yaml --- meegotouch-compositor.yaml +++ meegotouch-compositor.yaml @@ -1,6 +1,6 @@ Name: meegotouch-compositor Summary: MeeGo UI Compositing Window Manager -Version: 1.2.1 +Version: 1.2.2 Release: 1 Group: System/Desktop License: LGPLv2.1
