summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/graphics/gui/CMakeLists.txt1
-rw-r--r--data/graphics/gui/Makefile.am1
-rw-r--r--data/graphics/gui/popup.xml23
-rw-r--r--data/themes/enchilado/CMakeLists.txt1
-rw-r--r--data/themes/enchilado/Makefile.am1
-rw-r--r--data/themes/enchilado/popup.xml (renamed from data/themes/unity/beingpopup.xml)8
-rw-r--r--data/themes/pink/CMakeLists.txt1
-rw-r--r--data/themes/pink/Makefile.am1
-rw-r--r--data/themes/pink/popup.xml23
-rw-r--r--data/themes/unity/CMakeLists.txt3
-rw-r--r--data/themes/unity/Makefile.am3
-rw-r--r--data/themes/unity/popup.xml2
-rw-r--r--data/themes/unity/textpopup.xml19
-rw-r--r--data/themes/wood/CMakeLists.txt1
-rw-r--r--data/themes/wood/Makefile.am1
-rw-r--r--data/themes/wood/popup.xml (renamed from data/themes/unity/itempopup.xml)8
-rw-r--r--src/gui/beingpopup.cpp3
17 files changed, 68 insertions, 32 deletions
diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt
index 4d8560b61..c19714e94 100644
--- a/data/graphics/gui/CMakeLists.txt
+++ b/data/graphics/gui/CMakeLists.txt
@@ -26,6 +26,7 @@ SET (FILES
item_shortcut_background.xml
mouse.png
playerbox_background.xml
+ popup.xml
progress-indicator.png
progressbar.xml
quests.xml
diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am
index 96e653059..221418c71 100644
--- a/data/graphics/gui/Makefile.am
+++ b/data/graphics/gui/Makefile.am
@@ -29,6 +29,7 @@ gui_DATA = \
item_shortcut_background.xml \
mouse.png \
playerbox_background.xml \
+ popup.xml \
progress-indicator.png \
progressbar.xml \
quests.xml \
diff --git a/data/graphics/gui/popup.xml b/data/graphics/gui/popup.xml
new file mode 100644
index 000000000..5fea7ccd1
--- /dev/null
+++ b/data/graphics/gui/popup.xml
@@ -0,0 +1,23 @@
+<skinset name="Default" image="window.png">
+ <widget type="Window">
+ <option name="padding" value="4" />
+ <!-- Top Row -->
+ <part type="top-left-corner" xpos="0" ypos="0" width="4" height="4" />
+ <part type="top-edge" xpos="4" ypos="0" width="32" height="4" />
+ <part type="top-right-corner" xpos="36" ypos="0" width="4" height="4" />
+
+ <!-- Middle Row -->
+ <part type="left-edge" xpos="0" ypos="4" width="4" height="216" />
+ <part type="bg-quad" xpos="4" ypos="4" width="32" height="216" />
+ <part type="right-edge" xpos="36" ypos="4" width="4" height="216" />
+
+ <!-- Bottom Row -->
+ <part type="bottom-left-corner" xpos="0" ypos="220" width="4" height="4" />
+ <part type="bottom-edge" xpos="4" ypos="220" width="32" height="4" />
+ <part type="bottom-right-corner" xpos="36" ypos="220" width="4" height="4" />
+
+ <part type="closeImage" xpos="130" ypos="0" width="15" height="15" />
+ <part type="stickyImageUp" xpos="130" ypos="51" width="15" height="15" />
+ <part type="stickyImageDown" xpos="145" ypos="51" width="15" height="15" />
+ </widget>
+</skinset>
diff --git a/data/themes/enchilado/CMakeLists.txt b/data/themes/enchilado/CMakeLists.txt
index 696b6d184..80fdfdb85 100644
--- a/data/themes/enchilado/CMakeLists.txt
+++ b/data/themes/enchilado/CMakeLists.txt
@@ -2,6 +2,7 @@ SET (FILES
buy.xml
colors.xml
inventory.xml
+ popup.xml
quests.xml
sell.xml
server.xml
diff --git a/data/themes/enchilado/Makefile.am b/data/themes/enchilado/Makefile.am
index 98018b3bf..65dbcc21c 100644
--- a/data/themes/enchilado/Makefile.am
+++ b/data/themes/enchilado/Makefile.am
@@ -5,6 +5,7 @@ gui_DATA = \
buy.xml \
colors.xml \
inventory.xml \
+ popup.xml \
quests.xml \
sell.xml \
server.xml \
diff --git a/data/themes/unity/beingpopup.xml b/data/themes/enchilado/popup.xml
index 5b9c25bdb..c5ff657ec 100644
--- a/data/themes/unity/beingpopup.xml
+++ b/data/themes/enchilado/popup.xml
@@ -1,6 +1,6 @@
<skinset name="Default" image="window.png">
- <widget type="Window" xpos="260" ypos="0">
- <!-- <option name="padding" value="5" /> -->
+ <widget type="Window" xpos="190" ypos="30">
+ <option name="padding" value="6" />
<!-- Top Row -->
<part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
<part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
@@ -15,5 +15,9 @@
<part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" />
<part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" />
<part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" />
+
+ <part type="closeImage" xpos="-60" ypos="-30" width="15" height="15" />
+ <part type="stickyImageUp" xpos="-60" ypos="21" width="15" height="15" />
+ <part type="stickyImageDown" xpos="-45" ypos="21" width="15" height="15" />
</widget>
</skinset>
diff --git a/data/themes/pink/CMakeLists.txt b/data/themes/pink/CMakeLists.txt
index 4c8a7517d..061d9a1e9 100644
--- a/data/themes/pink/CMakeLists.txt
+++ b/data/themes/pink/CMakeLists.txt
@@ -3,6 +3,7 @@ SET (FILES
buy.xml
colors.xml
inventory.xml
+ popup.xml
progress-indicator.png
quests.xml
sell.xml
diff --git a/data/themes/pink/Makefile.am b/data/themes/pink/Makefile.am
index ac55c1d60..69e1d6b4e 100644
--- a/data/themes/pink/Makefile.am
+++ b/data/themes/pink/Makefile.am
@@ -6,6 +6,7 @@ gui_DATA = \
buy.xml \
colors.xml \
inventory.xml \
+ popup.xml \
progress-indicator.png \
quests.xml \
sell.xml \
diff --git a/data/themes/pink/popup.xml b/data/themes/pink/popup.xml
new file mode 100644
index 000000000..d9ed2522b
--- /dev/null
+++ b/data/themes/pink/popup.xml
@@ -0,0 +1,23 @@
+<skinset name="Default" image="window.png">
+ <widget type="Window" xpos="250" ypos="0">
+ <option name="padding" value="5" />
+ <!-- Top Row -->
+ <part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
+ <part type="top-edge" xpos="0" ypos="10" width="10" height="10" />
+ <part type="top-right-corner" xpos="0" ypos="20" width="10" height="10" />
+
+ <!-- Middle Row -->
+ <part type="left-edge" xpos="0" ypos="30" width="10" height="10" />
+ <part type="bg-quad" xpos="0" ypos="40" width="10" height="10" />
+ <part type="right-edge" xpos="0" ypos="50" width="10" height="10" />
+
+ <!-- Bottom Row -->
+ <part type="bottom-left-corner" xpos="0" ypos="60" width="10" height="10" />
+ <part type="bottom-edge" xpos="0" ypos="70" width="10" height="10" />
+ <part type="bottom-right-corner" xpos="10" ypos="0" width="132" height="134" />
+
+ <part type="closeImage" xpos="-120" ypos="0" width="15" height="15" />
+ <part type="stickyImageUp" xpos="-120" ypos="51" width="15" height="15" />
+ <part type="stickyImageDown" xpos="-105" ypos="51" width="15" height="15" />
+ </widget>
+</skinset>
diff --git a/data/themes/unity/CMakeLists.txt b/data/themes/unity/CMakeLists.txt
index 1838a56ae..3572a7dc1 100644
--- a/data/themes/unity/CMakeLists.txt
+++ b/data/themes/unity/CMakeLists.txt
@@ -1,10 +1,8 @@
SET (FILES
- beingpopup.xml
buy.xml
char.xml
colors.xml
inventory.xml
- itempopup.xml
npc.xml
popup.xml
quests.xml
@@ -12,7 +10,6 @@ SET (FILES
server.xml
shop.xml
social.xml
- textpopup.xml
window.png
window.xml
world.xml
diff --git a/data/themes/unity/Makefile.am b/data/themes/unity/Makefile.am
index a52571278..a27e3741b 100644
--- a/data/themes/unity/Makefile.am
+++ b/data/themes/unity/Makefile.am
@@ -2,12 +2,10 @@
guidir = $(pkgdatadir)/data/themes/unity
gui_DATA = \
- beingpopup.xml \
buy.xml \
char.xml \
colors.xml \
inventory.xml \
- itempopup.xml \
npc.xml \
popup.xml \
quests.xml \
@@ -15,7 +13,6 @@ gui_DATA = \
server.xml \
shop.xml \
social.xml \
- textpopup.xml \
window.png \
window.xml \
world.xml
diff --git a/data/themes/unity/popup.xml b/data/themes/unity/popup.xml
index 5b9c25bdb..4059063aa 100644
--- a/data/themes/unity/popup.xml
+++ b/data/themes/unity/popup.xml
@@ -1,6 +1,6 @@
<skinset name="Default" image="window.png">
<widget type="Window" xpos="260" ypos="0">
- <!-- <option name="padding" value="5" /> -->
+ <option name="padding" value="6" />
<!-- Top Row -->
<part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
<part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
diff --git a/data/themes/unity/textpopup.xml b/data/themes/unity/textpopup.xml
deleted file mode 100644
index 5b9c25bdb..000000000
--- a/data/themes/unity/textpopup.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<skinset name="Default" image="window.png">
- <widget type="Window" xpos="260" ypos="0">
- <!-- <option name="padding" value="5" /> -->
- <!-- Top Row -->
- <part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
- <part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
- <part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" />
-
- <!-- Middle Row -->
- <part type="left-edge" xpos="0" ypos="11" width="10" height="81" />
- <part type="bg-quad" xpos="11" ypos="11" width="127" height="81" />
- <part type="right-edge" xpos="139" ypos="11" width="12" height="81" />
-
- <!-- Bottom Row -->
- <part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" />
- <part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" />
- <part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" />
- </widget>
-</skinset>
diff --git a/data/themes/wood/CMakeLists.txt b/data/themes/wood/CMakeLists.txt
index d1ec80766..8c984dba7 100644
--- a/data/themes/wood/CMakeLists.txt
+++ b/data/themes/wood/CMakeLists.txt
@@ -4,6 +4,7 @@ SET (FILES
inventory.xml
item_shortcut_bgr.png
mouse.png
+ popup.xml
quests.xml
sell.xml
server.xml
diff --git a/data/themes/wood/Makefile.am b/data/themes/wood/Makefile.am
index 1011022fc..b2ada3479 100644
--- a/data/themes/wood/Makefile.am
+++ b/data/themes/wood/Makefile.am
@@ -7,6 +7,7 @@ gui_DATA = \
inventory.xml \
item_shortcut_bgr.png \
mouse.png \
+ popup.xml \
quests.xml \
sell.xml \
server.xml \
diff --git a/data/themes/unity/itempopup.xml b/data/themes/wood/popup.xml
index 5b9c25bdb..1a1964af5 100644
--- a/data/themes/unity/itempopup.xml
+++ b/data/themes/wood/popup.xml
@@ -1,8 +1,8 @@
<skinset name="Default" image="window.png">
<widget type="Window" xpos="260" ypos="0">
- <!-- <option name="padding" value="5" /> -->
+ <option name="padding" value="6" />
<!-- Top Row -->
- <part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
+ <part type="top-left-corner" width="10" height="10" />
<part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
<part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" />
@@ -15,5 +15,9 @@
<part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" />
<part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" />
<part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" />
+
+ <part type="closeImage" xpos="-130" ypos="0" width="15" height="15" />
+ <part type="stickyImageUp" xpos="-130" ypos="51" width="15" height="15" />
+ <part type="stickyImageDown" xpos="-115" ypos="51" width="15" height="15" />
</widget>
</skinset>
diff --git a/src/gui/beingpopup.cpp b/src/gui/beingpopup.cpp
index 87db79aa6..3e3c7e29d 100644
--- a/src/gui/beingpopup.cpp
+++ b/src/gui/beingpopup.cpp
@@ -190,8 +190,7 @@ void BeingPopup::show(const int x, const int y, Being *const b)
if (label4)
height += getFont()->getHeight();
- const int pad = 2 * getPadding();
- setContentSize(minWidth + pad, height + pad);
+ setContentSize(minWidth, height);
position(x, y);
return;
}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-06 15:11:28 +0000