X-Git-Url: http://git.tdb.fi/?p=libs%2Fgltk.git;a=blobdiff_plain;f=source%2Ftoggle.cpp;h=dd6ce359cad95ef691884b1e67128fcebafb81be;hp=1495344219f89013e790636e4d621f21e8399013;hb=50bf1ef2e2c3c38de20f6996a6c5ed0066111177;hpb=af13797a82b242a3cd8fdd405b057a9e311631ac diff --git a/source/toggle.cpp b/source/toggle.cpp index 1495344..dd6ce35 100644 --- a/source/toggle.cpp +++ b/source/toggle.cpp @@ -22,7 +22,10 @@ Toggle::Toggle(const Resources &r): void Toggle::set_value(bool v) { value=v; - state=(value ? ACTIVE : HOVER); + if(value) + state|=ACTIVE; + else + state&=~ACTIVE; } void Toggle::button_press(int, int, unsigned btn) @@ -40,25 +43,11 @@ void Toggle::button_release(int x, int y, unsigned btn) set_value(!value); signal_toggled.emit(value); } - else - state=NORMAL; pressed=false; } } -void Toggle::pointer_enter() -{ - if(!value) - state=HOVER; -} - -void Toggle::pointer_leave() -{ - if(!value) - state=NORMAL; -} - void Toggle::render_special(const Part &part) const { if(part.get_name()=="text") @@ -81,7 +70,10 @@ Toggle &Toggle::Loader::get_object() const void Toggle::Loader::finish() { Toggle &tgl=static_cast(wdg); - tgl.state=(tgl.value ? ACTIVE : NORMAL); + if(tgl.value) + tgl.state|=ACTIVE; + else + tgl.state&=~ACTIVE; } } // namespace GLtk