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

using toolbar border width, color and bevel width

Browse source
This commit is contained in:
fluxgen 2003-06-24 18:33:29 +00:00
parent cb40c16274
commit cae1bf89be
1 changed files with 28 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
src/Toolbar.cc
View file

@ -22,7 +22,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: Toolbar.cc,v 1.93 2003/06/23 13:17:57 fluxgen Exp $ // $Id: Toolbar.cc,v 1.94 2003/06/24 18:33:29 fluxgen Exp $
#include "Toolbar.hh" #include "Toolbar.hh"
@ -458,7 +458,7 @@ void Toolbar::reconfigure() {
if (m_iconbar.get()) if (m_iconbar.get())
m_iconbar->setVertical(vertical); m_iconbar->setVertical(vertical);
frame.bevel_w = screen().rootTheme().bevelWidth(); frame.bevel_w = theme().bevelWidth();
// recallibrate size // recallibrate size
setPlacement(placement()); setPlacement(placement());
@ -719,8 +719,8 @@ void Toolbar::reconfigure() {
if (tmp) if (tmp)
image_ctrl.removeImage(tmp); image_ctrl.removeImage(tmp);
frame.window.setBorderColor(screen().rootTheme().borderColor()); frame.window.setBorderColor(theme().borderColor());
frame.window.setBorderWidth(screen().rootTheme().borderWidth()); frame.window.setBorderWidth(theme().borderWidth());
frame.window.clear(); frame.window.clear();
@ -1157,6 +1157,8 @@ void Toolbar::setPlacement(Toolbar::Placement where) {
frame.height += 2; frame.height += 2;
frame.height += (frame.bevel_w * 2); frame.height += (frame.bevel_w * 2);
int bevel_width = theme().bevelWidth();
int border_width = theme().borderWidth();
// should we flipp sizes? // should we flipp sizes?
if (isVertical()) { if (isVertical()) {
@ -1179,92 +1181,77 @@ void Toolbar::setPlacement(Toolbar::Placement where) {
frame.x = head_x; frame.x = head_x;
frame.y = head_y; frame.y = head_y;
frame.x_hidden = head_x; frame.x_hidden = head_x;
frame.y_hidden = head_y + frame.y_hidden = head_y + bevel_width - border_width - frame.height;
screen().rootTheme().bevelWidth() -
screen().rootTheme().borderWidth() - frame.height;
break; break;
case BOTTOMLEFT: case BOTTOMLEFT:
frame.x = head_x; frame.x = head_x;
frame.y = head_y + head_h - frame.height - frame.y = head_y + head_h - frame.height - border_width*2;
screen().rootTheme().borderWidth()*2;
frame.x_hidden = head_x; frame.x_hidden = head_x;
frame.y_hidden = head_y + head_h - screen().rootTheme().bevelWidth() - frame.y_hidden = head_y + head_h - bevel_width - border_width;
screen().rootTheme().borderWidth();
break; break;
case TOPCENTER: case TOPCENTER:
frame.x = head_x + ((head_w - frame.width) / 2); frame.x = head_x + ((head_w - frame.width) / 2);
frame.y = head_y; frame.y = head_y;
frame.x_hidden = frame.x; frame.x_hidden = frame.x;
frame.y_hidden = head_y + frame.y_hidden = head_y + bevel_width - border_width - frame.height;
screen().rootTheme().bevelWidth() -
screen().rootTheme().borderWidth() - frame.height;
break; break;
case TOPRIGHT: case TOPRIGHT:
frame.x = head_x + head_w - frame.width - screen().rootTheme().borderWidth()*2; frame.x = head_x + head_w - frame.width - border_width*2;
frame.y = head_y; frame.y = head_y;
frame.x_hidden = frame.x; frame.x_hidden = frame.x;
break; break;
case BOTTOMRIGHT: case BOTTOMRIGHT:
frame.x = head_x + head_w - frame.width - frame.x = head_x + head_w - frame.width - border_width*2;
screen().rootTheme().borderWidth()*2; frame.y = head_y + head_h - frame.height - border_width*2;
frame.y = head_y + head_h - frame.height -
screen().rootTheme().borderWidth()*2;
frame.x_hidden = frame.x; frame.x_hidden = frame.x;
frame.y_hidden = head_y + head_h - screen().rootTheme().bevelWidth() - frame.y_hidden = head_y + head_h - bevel_width - border_width;
screen().rootTheme().borderWidth();
break; break;
case BOTTOMCENTER: // default is BOTTOMCENTER case BOTTOMCENTER: // default is BOTTOMCENTER
default: default:
frame.x = head_x + (head_w - frame.width) / 2; frame.x = head_x + (head_w - frame.width) / 2;
frame.y = head_y + head_h - frame.height - screen().rootTheme().borderWidth()*2; frame.y = head_y + head_h - frame.height - border_width*2;
frame.x_hidden = frame.x; frame.x_hidden = frame.x;
frame.y_hidden = head_y + head_h - screen().rootTheme().bevelWidth() - frame.y_hidden = head_y + head_h - bevel_width - border_width;
screen().rootTheme().borderWidth();
break; break;
case LEFTCENTER: case LEFTCENTER:
frame.x = head_x; frame.x = head_x;
frame.y = head_y + (head_h - frame.height)/2; frame.y = head_y + (head_h - frame.height)/2;
frame.x_hidden = frame.x - frame.width + frame.x_hidden = frame.x - frame.width + bevel_width + border_width;
screen().rootTheme().bevelWidth() + screen().rootTheme().borderWidth();
frame.y_hidden = frame.y; frame.y_hidden = frame.y;
break; break;
case LEFTTOP: case LEFTTOP:
frame.x = head_x; frame.x = head_x;
frame.y = head_y; frame.y = head_y;
frame.x_hidden = frame.x - frame.width + frame.x_hidden = frame.x - frame.width + bevel_width + border_width;
screen().rootTheme().bevelWidth() + screen().rootTheme().borderWidth();
frame.y_hidden = frame.y; frame.y_hidden = frame.y;
break; break;
case LEFTBOTTOM: case LEFTBOTTOM:
frame.x = head_x; frame.x = head_x;
frame.y = head_y + head_h - frame.height - screen().rootTheme().borderWidth()*2; frame.y = head_y + head_h - frame.height - border_width*2;
frame.x_hidden = frame.x - frame.width + frame.x_hidden = frame.x - frame.width + bevel_width + border_width;
screen().rootTheme().bevelWidth() + screen().rootTheme().borderWidth();
frame.y_hidden = frame.y; frame.y_hidden = frame.y;
break; break;
case RIGHTCENTER: case RIGHTCENTER:
frame.x = head_x + head_w - frame.width - screen().rootTheme().borderWidth()*2; frame.x = head_x + head_w - frame.width - border_width*2;
frame.y = head_y + (head_h - frame.height)/2; frame.y = head_y + (head_h - frame.height)/2;
frame.x_hidden = frame.x + frame.width - frame.x_hidden = frame.x + frame.width - bevel_width - border_width;
screen().rootTheme().bevelWidth() - screen().rootTheme().borderWidth();
frame.y_hidden = frame.y; frame.y_hidden = frame.y;
break; break;
case RIGHTTOP: case RIGHTTOP:
frame.x = head_x + head_w - frame.width - screen().rootTheme().borderWidth()*2; frame.x = head_x + head_w - frame.width - border_width*2;
frame.y = head_y; frame.y = head_y;
frame.x_hidden = frame.x + frame.width - frame.x_hidden = frame.x + frame.width - bevel_width - border_width;
screen().rootTheme().bevelWidth() - screen().rootTheme().borderWidth();
frame.y_hidden = frame.y; frame.y_hidden = frame.y;
break; break;
case RIGHTBOTTOM: case RIGHTBOTTOM:
frame.x = head_x + head_w - frame.width - screen().rootTheme().borderWidth()*2; frame.x = head_x + head_w - frame.width - border_width*2;
frame.y = head_y + head_h - frame.height - screen().rootTheme().borderWidth()*2; frame.y = head_y + head_h - frame.height - border_width*2;
frame.x_hidden = frame.x + frame.width - frame.x_hidden = frame.x + frame.width - bevel_width - border_width;
screen().rootTheme().bevelWidth() - screen().rootTheme().borderWidth();
frame.y_hidden = frame.y; frame.y_hidden = frame.y;
break; break;
} }