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

Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire-and-sim-ownership

Browse source
This commit is contained in:
Seth Alves 2015-06-29 16:56:04 -07:00
commit 0a734c9d3d
4 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
interface/resources/images/link.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 43 KiB

22
interface/resources/qml/Tooltip.qml
View file

@ -21,8 +21,8 @@ Hifi.Tooltip {
Rectangle { Rectangle {
id: border id: border
color: "#7f000000" color: "#BF000000"
width: 322 width: 330
height: col.height + hifi.layout.spacing * 2 height: col.height + hifi.layout.spacing * 2
Column { Column {
@ -40,6 +40,7 @@ Hifi.Tooltip {
color: "white" color: "white"
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
horizontalAlignment: Text.AlignHCenter
font.pixelSize: hifi.fonts.pixelSize * 2 font.pixelSize: hifi.fonts.pixelSize * 2
text: root.title text: root.title
wrapMode: Text.WrapAnywhere wrapMode: Text.WrapAnywhere
@ -61,6 +62,12 @@ Hifi.Tooltip {
anchors.right: parent.right anchors.right: parent.right
} }
Item {
id: firstSpacer
width: col.width
height: 5
}
Image { Image {
id: tooltipPic id: tooltipPic
source: root.imageURL source: root.imageURL
@ -68,7 +75,12 @@ Hifi.Tooltip {
width: 320 width: 320
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
verticalAlignment: Image.AlignVCenter }
Item {
id: secondSpacer
width: col.width
height: 5
} }
Text { Text {
@ -78,8 +90,8 @@ Hifi.Tooltip {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
text: root.description text: root.description
font.pixelSize: hifi.fonts.pixelSize font.pixelSize: 16
wrapMode: Text.WrapAnywhere wrapMode: Text.WordWrap
} }
} }
} }

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

@ -23,7 +23,7 @@
const xColor DEFAULT_BACKGROUND_COLOR = { 0, 0, 0 }; const xColor DEFAULT_BACKGROUND_COLOR = { 0, 0, 0 };
const float DEFAULT_BACKGROUND_ALPHA = 0.7f; const float DEFAULT_BACKGROUND_ALPHA = 0.7f;
const int DEFAULT_MARGIN = 10; const int DEFAULT_MARGIN = 10;
const int DEFAULT_FONTSIZE = 11; const int DEFAULT_FONTSIZE = 12;
const int DEFAULT_FONT_WEIGHT = 50; const int DEFAULT_FONT_WEIGHT = 50;
class TextRenderer; class TextRenderer;

2
libraries/ui/src/CursorManager.cpp
View file

@ -50,7 +50,7 @@ namespace Cursor {
Manager::Manager() { Manager::Manager() {
ICONS[Icon::DEFAULT] = PathUtils::resourcesPath() + "images/arrow.png"; ICONS[Icon::DEFAULT] = PathUtils::resourcesPath() + "images/arrow.png";
ICONS[Icon::LINK] = PathUtils::resourcesPath() + "images/reticleLink.png"; ICONS[Icon::LINK] = PathUtils::resourcesPath() + "images/link.png";
} }
Manager& Manager::instance() { Manager& Manager::instance() {