From 8f3aaee987a8927712f59164ef84f2996418ea6f Mon Sep 17 00:00:00 2001 From: Ulukyn Date: Tue, 10 Mar 2020 16:08:55 +0100 Subject: [PATCH 1/3] Changed: new name of Enclyclopedia window --- .../client/src/interface_v3/encyclopedia_manager.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/ryzom/client/src/interface_v3/encyclopedia_manager.h b/code/ryzom/client/src/interface_v3/encyclopedia_manager.h index dc5e97651..b1b589b16 100644 --- a/code/ryzom/client/src/interface_v3/encyclopedia_manager.h +++ b/code/ryzom/client/src/interface_v3/encyclopedia_manager.h @@ -77,11 +77,11 @@ private: bool _Initializing; }; -#define CONT_ENCY "ui:interface:encyclopedia" -#define LIST_ENCY_ALBUM "ui:interface:encyclopedia:content:sbtree:tree_list" -#define PAGE_ENCY_ALBUM "ui:interface:encyclopedia:content:album" -#define PAGE_ENCY_THEMA "ui:interface:encyclopedia:content:theme" -#define PAGE_ENCY_HELP "ui:interface:encyclopedia:content:help" +#define CONT_ENCY "ui:interface:legacy_encyclopedia" +#define LIST_ENCY_ALBUM "ui:interface:legacy_encyclopedia:content:sbtree:tree_list" +#define PAGE_ENCY_ALBUM "ui:interface:legacy_encyclopedia:content:album" +#define PAGE_ENCY_THEMA "ui:interface:legacy_encyclopedia:content:theme" +#define PAGE_ENCY_HELP "ui:interface:legacy_encyclopedia:content:help" #endif // RY_ENCYCLOPEDIA_MANAGER_H From 1f736fc347957fe42ede0f54acddebe2a9e0f2fa Mon Sep 17 00:00:00 2001 From: Nimetu Date: Fri, 6 Mar 2020 15:28:58 +0200 Subject: [PATCH 2/3] Fixed: Scroll bar losing position when group window is minimized --- code/nel/src/gui/ctrl_scroll.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/nel/src/gui/ctrl_scroll.cpp b/code/nel/src/gui/ctrl_scroll.cpp index e97bd8cd4..a940f6561 100644 --- a/code/nel/src/gui/ctrl_scroll.cpp +++ b/code/nel/src/gui/ctrl_scroll.cpp @@ -45,7 +45,7 @@ namespace NLGUI _Aligned = 1; _TrackPos = 0; _TrackDispPos = 0; - _TrackSize = _TrackSizeMin = 16; + _TrackSize = _TrackSizeMin = 8; _Min = 0; _Max = 100; _Value = 0; From f853adfcbaba3b93d48d5f6e902aafd66de231e3 Mon Sep 17 00:00:00 2001 From: Nimetu Date: Sat, 14 Mar 2020 01:23:38 +0200 Subject: [PATCH 3/3] Changed: show/hide rp_logo_x icons depending if texture is set or not --- .../interface_v3/group_in_scene_user_info.cpp | 33 +++++++++++-------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/code/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp b/code/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp index 53cddc93b..d36618a9f 100644 --- a/code/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp +++ b/code/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp @@ -461,22 +461,29 @@ CGroupInSceneUserInfo *CGroupInSceneUserInfo::build (CEntityCL *entity) if (rpTags) { CPlayerCL * pPlayer = dynamic_cast(entity); - CViewBitmap *bitmap; + CViewBitmap *rp1 = dynamic_cast(leftGroup->getView ("rp_logo_1")); + CViewBitmap *rp2 = dynamic_cast(leftGroup->getView ("rp_logo_2")); + CViewBitmap *rp3 = dynamic_cast(leftGroup->getView ("rp_logo_3")); + CViewBitmap *rp4 = dynamic_cast(leftGroup->getView ("rp_logo_4")); + if (pPlayer == NULL || (pPlayer != NULL && pPlayer->getPvpMode() & PVP_MODE::PvpFaction)) { - bitmap = dynamic_cast(leftGroup->getView ("rp_logo_1")); - if (bitmap) - bitmap->setTexture(entityTag1.toString()); - bitmap = dynamic_cast(leftGroup->getView ("rp_logo_2")); - if (bitmap) - bitmap->setTexture(entityTag2.toString()); + if (rp1) rp1->setTexture(entityTag1.toString()); + if (rp2) rp2->setTexture(entityTag2.toString()); + } + else + { + entityTag1.clear(); + entityTag2.clear(); } - bitmap = dynamic_cast(leftGroup->getView ("rp_logo_3")); - if (bitmap) - bitmap->setTexture(entityTag3.toString()); - bitmap = dynamic_cast(leftGroup->getView ("rp_logo_4")); - if (bitmap) - bitmap->setTexture(entityTag4.toString()); + if (rp3) rp3->setTexture(entityTag3.toString()); + if (rp4) rp4->setTexture(entityTag4.toString()); + + // hide if texture is empty + if (rp1) rp1->setActive(!entityTag1.empty()); + if (rp2) rp2->setActive(!entityTag2.empty()); + if (rp3) rp3->setActive(!entityTag3.empty()); + if (rp4) rp4->setActive(!entityTag4.empty()); } // Get the permanent content bitmap