make image dithering value load correctly

This commit is contained in:
Dana Jansens 2002-05-11 18:33:29 +00:00
parent b424a72384
commit c7810a3c38
3 changed files with 9 additions and 7 deletions

View file

@ -1,5 +1,8 @@
Changelog for Openbox:
1.2.0:
* make image dithering value load correctly
1.1.0:
* improved focused window logic to remove a segfault
when the focused window on an inactive workspace

View file

@ -953,11 +953,10 @@ void BScreen::setAutoRaise(bool a) {
void BScreen::setImageDither(bool d, bool reconfig) {
resource.image_dither = d;
image_control->setDither(d);
ostrstream s;
s << "session.screen" << getScreenNumber() << ".imageDither" << ends;
config.setValue(s.str(), resource.image_dither);
config.setValue(s.str(), d);
if (reconfig)
reconfigure();
s.rdbuf()->freeze(0);
@ -1146,7 +1145,7 @@ void BScreen::saveWorkspaceNames() {
void BScreen::save() {
setSloppyFocus(resource.sloppy_focus);
setAutoRaise(resource.auto_raise);
setImageDither(resource.image_dither, false);
setImageDither(imageDither(), false);
setOpaqueMove(resource.opaque_move);
setFullMax(resource.full_max);
setFocusNew(resource.focus_new);
@ -1373,9 +1372,9 @@ void BScreen::load() {
rname << rscreen.str() << "imageDither" << ends;
rclass << rscreen.str() << "ImageDither" << ends;
if (config.getValue(rname.str(), rclass.str(), b))
resource.image_dither = b;
image_control->setDither(b);
else
resource.image_dither = true;
image_control->setDither(true);
rname.seekp(0); rclass.seekp(0);
rname.rdbuf()->freeze(0); rclass.rdbuf()->freeze(0);

View file

@ -132,7 +132,7 @@ private:
ToolbarStyle tstyle;
MenuStyle mstyle;
bool sloppy_focus, auto_raise, auto_edge_balance, image_dither, focus_last,
bool sloppy_focus, auto_raise, auto_edge_balance, focus_last,
ordered_dither, opaque_move, hide_toolbar, full_max, focus_new;
BColor border_color;
Resource styleconfig;
@ -220,7 +220,7 @@ public:
inline bool autoRaise() const { return resource.auto_raise; }
void setAutoRaise(bool a);
inline bool imageDither() const { return resource.image_dither; }
inline bool imageDither() const { return image_control->doDither(); }
void setImageDither(bool d, bool reconfig = true);
inline bool orderedDither() const { return resource.ordered_dither; }