adding gfxRect struct. Add clipping support for rects.

This commit is contained in:
pavlov%pavlov.net 2005-04-06 07:36:31 +00:00
Родитель 9c6036938a
Коммит d4853a2260
4 изменённых файлов: 63 добавлений и 5 удалений

Просмотреть файл

@ -16,6 +16,7 @@ EXPORTS = gfxASurface.h \
gfxMatrix.h \
gfxPattern.h \
gfxPoint.h \
gfxRect.h \
gfxRegion.h \
gfxTextRun.h \
$(NULL)

Просмотреть файл

@ -43,11 +43,11 @@
#include "gfxColor.h"
#include "gfxPattern.h"
#include "gfxPoint.h"
#include "gfxRect.h"
class gfxASurface;
class gfxMatrix;
class gfxRegion;
class gfxRect;
class gfxFilter;
class gfxTextRun;

Просмотреть файл

@ -0,0 +1,59 @@
/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is Oracle Corporation code.
*
* The Initial Developer of the Original Code is Oracle Corporation.
* Portions created by the Initial Developer are Copyright (C) 2005
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Stuart Parmenter <pavlov@pavlov.net>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#ifndef GFXRECT_H
#define GFXRECT_H
struct gfxRect {
double x, y, width, height;
gfxRect() {}
gfxRect(const gfxRect& s) : x(s.x), y(s.y), width(s.width), height(s.height) {}
gfxRect(double _x, double _y, double _width, double _height) : x(_x), y(_y),
width(_width), height(_height) {}
int operator==(const gfxRect& s) const {
return ((x == s.x) && (y == s.y) && (width == s.width) && (height == s.height));
}
int operator!=(const gfxRect& s) const {
return ((x != s.x) || (y != s.y) || (width != s.width) || (height != s.height));
}
// XXX figure out what methods (intersect, union, etc) we use and add them.
};
#endif /* GFXRECT_H */

Просмотреть файл

@ -237,11 +237,9 @@ double gfxContext::CurrentMiterLimit() const
// clipping
void gfxContext::Clip(const gfxRect& rect)
{
/*
cairo_new_path();
cairo_new_path(mCairo);
cairo_rectangle(mCairo, rect.x, rect.y, rect.width, rect.height);
cairo_clip();
*/
cairo_clip(mCairo);
}
void gfxContext::Clip(const gfxRegion& region)
{