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

fixed bug in rotate

Browse source
This commit is contained in:
fluxgen 2002-12-09 22:12:56 +00:00
parent 6073c44a8e
commit c563042bdd
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/FbTk/XFontImp.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: XFontImp.cc,v 1.4 2002/12/01 13:42:14 rathnor Exp $ // $Id: XFontImp.cc,v 1.5 2002/12/09 22:12:56 fluxgen Exp $
#include "XFontImp.hh" #include "XFontImp.hh"
#include "App.hh" #include "App.hh"
@ -34,7 +34,7 @@ using namespace std;
namespace FbTk { namespace FbTk {
XFontImp::XFontImp(const char *fontname):m_rotfont(0), m_fontstruct(0), XFontImp::XFontImp(const char *fontname):m_rotfont(0), m_fontstruct(0),
m_angle(0) { m_angle(0), m_rotate(true) {
if (fontname != 0) if (fontname != 0)
load(fontname); load(fontname);
} }
@ -63,6 +63,12 @@ bool XFontImp::load(const std::string &fontname) {
XFreeFont(App::instance()->display(), m_fontstruct); XFreeFont(App::instance()->display(), m_fontstruct);
m_fontstruct = font; //set new font m_fontstruct = font; //set new font
if (m_rotfont != 0) {
freeRotFont(); // free old rotated font
rotate(m_angle); // allocate new rotated font and rotate it to old angle
}
return true; return true;
} }
@ -70,7 +76,7 @@ void XFontImp::drawText(Drawable w, int screen, GC gc, const char *text, size_t
if (m_fontstruct == 0) if (m_fontstruct == 0)
return; return;
// use roated font functions? // use roated font functions?
if (m_rotfont != 0) { if (m_rotfont != 0 && m_rotate) {
drawRotText(w, screen, gc, text, len, x, y); drawRotText(w, screen, gc, text, len, x, y);
return; return;
} }
@ -101,18 +107,24 @@ unsigned int XFontImp::height() const {
void XFontImp::rotate(float angle) { void XFontImp::rotate(float angle) {
//we must have a font loaded before we rotate //we must have a font loaded before we rotate
if (m_fontstruct == 0) if (m_fontstruct == 0 || m_fontstruct->per_char == 0)
return; return;
if (m_rotfont != 0) if (m_rotfont != 0)
freeRotFont(); freeRotFont();
// no need for rotating, use regular font // no need for rotating, use regular font
if (angle == 0) if (angle == 0) {
m_angle = 0;
return; return;
}
//get positive angle //get positive angle
while (angle < 0) while (angle < 0)
angle += 360; angle += 360;
m_angle = angle;
char val; char val;
XImage *I1, *I2; XImage *I1, *I2;
// X system default vars // X system default vars