add rules & add 'show-content-access' rule
This commit is contained in:
+12
-2
@@ -348,7 +348,7 @@ void Hud::update(bool visible) {
|
||||
}
|
||||
|
||||
glm::vec2 invSize = contentAccessPanel->getSize();
|
||||
contentAccessPanel->setVisible(inventoryView != nullptr);
|
||||
contentAccessPanel->setVisible(inventoryView != nullptr && showContentPanel);
|
||||
contentAccessPanel->setSize(glm::vec2(invSize.x, Window::height));
|
||||
contentAccess->setMinSize(glm::vec2(1, Window::height));
|
||||
hotbarView->setVisible(visible && !(secondUI && !inventoryView));
|
||||
@@ -553,7 +553,9 @@ void Hud::updateElementsPosition(const Viewport& viewport) {
|
||||
const uint height = viewport.getHeight();
|
||||
|
||||
if (inventoryOpen) {
|
||||
float caWidth = inventoryView ? contentAccess->getSize().x : 0.0f;
|
||||
float caWidth = inventoryView && showContentPanel
|
||||
? contentAccess->getSize().x
|
||||
: 0.0f;
|
||||
contentAccessPanel->setPos(glm::vec2(width-caWidth, 0));
|
||||
|
||||
glm::vec2 invSize = inventoryView ? inventoryView->getSize() : glm::vec2();
|
||||
@@ -628,3 +630,11 @@ std::shared_ptr<Inventory> Hud::getBlockInventory() {
|
||||
}
|
||||
return blockUI->getInventory();
|
||||
}
|
||||
|
||||
bool Hud::isContentAccess() const {
|
||||
return showContentPanel;
|
||||
}
|
||||
|
||||
void Hud::setContentAccess(bool flag) {
|
||||
showContentPanel = flag;
|
||||
}
|
||||
|
||||
@@ -105,6 +105,8 @@ class Hud : public util::ObjectsKeeper {
|
||||
glm::ivec3 blockPos {};
|
||||
/// @brief Id of the block open (used to detect block destruction or replacement)
|
||||
blockid_t currentblockid = 0;
|
||||
/// @brief Show content access panel
|
||||
bool showContentPanel = true;
|
||||
|
||||
/// @brief UI element will be dynamicly positioned near to inventory or in screen center
|
||||
std::shared_ptr<gui::UINode> secondUI = nullptr;
|
||||
@@ -172,6 +174,10 @@ public:
|
||||
|
||||
std::shared_ptr<Inventory> getBlockInventory();
|
||||
|
||||
bool isContentAccess() const;
|
||||
|
||||
void setContentAccess(bool flag);
|
||||
|
||||
static bool showGeneratorMinimap;
|
||||
|
||||
/// @brief Runtime updating debug visualization texture
|
||||
|
||||
Reference in New Issue
Block a user