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

texture limits were hardcoded to 3200 in TextureRender.cc .. this lead

Browse source 
to useless warnings on huge xinerama setups with those nifty 20' or bigger
lcds ... we use now screen dimensions to set a sane limit for textures
This commit is contained in:
mathias 2005-09-03 14:44:07 +00:00
parent 02c62d04f1
commit 2b2236e97c
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,5 +1,9 @@
(Format: Year/Month/Day)
Changes for 0.9.14:
*05/09/03:
* Exchanged the hardcoded 3200 pixel limit for texture size to
a calculated value based on screen dimensions (Mathias)
FbTk/TextureRender.cc
*05/08/31:
* Added SVN Revision number output in info output (Thanks php-coder)
nls/*/Translation.m, nls/fluxbox-nls.hh src/main.cc

11
src/FbTk/TextureRender.cc
View file

@ -62,16 +62,19 @@ TextureRender::TextureRender(ImageControl &imgctrl,
width(static_cast<signed>((w > 0 ? w : 1))), height(static_cast<signed>(h > 0 ? h : 1)),
xtable(0), ytable(0) {
unsigned int texture_max_width = WidthOfScreen(ScreenOfDisplay(FbTk::App::instance()->display(), imgctrl.screenNumber())) * 2;
unsigned int texture_max_height = HeightOfScreen(ScreenOfDisplay(FbTk::App::instance()->display(), imgctrl.screenNumber())) * 2;
_FB_USES_NLS;
// clamp to "normal" size
if (width > 3200) {
if (width > texture_max_width) {
cerr<<"TextureRender: "<<_FBTKTEXT(Error, BigWidth, "Warning! Width > 3200 setting Width = 3200", "Image width seems too big, clamping")<<endl;
width = 3200;
width = texture_max_width;
}
if (height > 3200) {
if (height > texture_max_height) {
cerr<<"TextureRender: "<<_FBTKTEXT(Error, BigHeight, "Warning! Height > 3200 setting Height = 3200", "Image height seems too big, clamping")<<endl;
height = 3200;
height = texture_max_height;
}