nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed shape bug when changing between shaped and non shaped themes

Browse source
This commit is contained in:
fluxgen 2003-08-13 22:52:35 +00:00
parent 6daa8f95d6
commit c14986b485
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/Shape.cc
View file

@ -19,7 +19,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Shape.cc,v 1.2 2003/07/10 14:47:53 fluxgen Exp $ // $Id: Shape.cc,v 1.3 2003/08/13 22:52:35 fluxgen Exp $
#include "Shape.hh" #include "Shape.hh"
#include "FbWindow.hh" #include "FbWindow.hh"
@ -144,6 +144,18 @@ Shape::Shape(FbTk::FbWindow &win, int shapeplaces):
Shape::~Shape() { Shape::~Shape() {
if (m_shape != 0) if (m_shape != 0)
XFreePixmap(FbTk::App::instance()->display(), m_shape); XFreePixmap(FbTk::App::instance()->display(), m_shape);
#ifdef SHAPE
if (m_win != 0 && m_win->window()) {
// reset shape of window
XShapeCombineMask(FbTk::App::instance()->display(),
m_win->window(),
ShapeBounding,
0, 0,
0,
ShapeSet);
}
#endif // SHAPE
} }
void Shape::setPlaces(int shapeplaces) { void Shape::setPlaces(int shapeplaces) {
@ -164,9 +176,8 @@ void Shape::update() {
} }
if (m_shape == 0) // the m_shape can be = 0 which will just reset the shape mask
return; // and make the window normal
XShapeCombineMask(FbTk::App::instance()->display(), XShapeCombineMask(FbTk::App::instance()->display(),
m_win->window(), m_win->window(),
ShapeBounding, ShapeBounding,