Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 01:56:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add default background color and initialize property

Browse source
This commit is contained in:
Ryan Huffman 2014-06-30 12:20:05 -07:00
parent 9ae65e4439
commit 123773a8e3
4 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/ui/overlays/Overlay.cpp
View file

@ -22,7 +22,7 @@
Overlay::Overlay() : Overlay::Overlay() :
_parent(NULL), _parent(NULL),
_alpha(DEFAULT_ALPHA), _alpha(DEFAULT_ALPHA),
_color(DEFAULT_BACKGROUND_COLOR), _color(DEFAULT_OVERLAY_COLOR),
_visible(true), _visible(true),
_anchor(NO_ANCHOR) _anchor(NO_ANCHOR)
{ {

2
interface/src/ui/overlays/Overlay.h
View file

@ -21,7 +21,7 @@
#include <SharedUtil.h> // for xColor #include <SharedUtil.h> // for xColor
const xColor DEFAULT_BACKGROUND_COLOR = { 255, 255, 255 }; const xColor DEFAULT_OVERLAY_COLOR = { 255, 255, 255 };
const float DEFAULT_ALPHA = 0.7f; const float DEFAULT_ALPHA = 0.7f;
class Overlay : public QObject { class Overlay : public QObject {

1
interface/src/ui/overlays/TextOverlay.cpp
View file

@ -18,6 +18,7 @@
#include "ui/TextRenderer.h" #include "ui/TextRenderer.h"
TextOverlay::TextOverlay() : TextOverlay::TextOverlay() :
_backgroundColor(DEFAULT_BACKGROUND_COLOR),
_leftMargin(DEFAULT_MARGIN), _leftMargin(DEFAULT_MARGIN),
_topMargin(DEFAULT_MARGIN), _topMargin(DEFAULT_MARGIN),
_fontSize(DEFAULT_FONTSIZE) _fontSize(DEFAULT_FONTSIZE)

1
interface/src/ui/overlays/TextOverlay.h
View file

@ -28,6 +28,7 @@
#include "Overlay.h" #include "Overlay.h"
#include "Overlay2D.h" #include "Overlay2D.h"
const xColor DEFAULT_BACKGROUND_COLOR = { 0, 0, 0 };
const int DEFAULT_MARGIN = 10; const int DEFAULT_MARGIN = 10;
const int DEFAULT_FONTSIZE = 11; const int DEFAULT_FONTSIZE = 11;