mirror of
https://github.com/hyprwm/Hyprland
synced 2024-11-17 05:06:00 +01:00
misc: Rename all instances of "emtpy" to "empty" (#7522)
This commit is contained in:
parent
28f6c2df59
commit
ca85455a8e
4 changed files with 10 additions and 10 deletions
|
@ -2624,7 +2624,7 @@ void CCompositor::forceReportSizesToWindowsOnWorkspace(const WORKSPACEID& wid) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
PHLWORKSPACE CCompositor::createNewWorkspace(const WORKSPACEID& id, const MONITORID& monid, const std::string& name, bool isEmtpy) {
|
PHLWORKSPACE CCompositor::createNewWorkspace(const WORKSPACEID& id, const MONITORID& monid, const std::string& name, bool isEmpty) {
|
||||||
const auto NAME = name == "" ? std::to_string(id) : name;
|
const auto NAME = name == "" ? std::to_string(id) : name;
|
||||||
auto monID = monid;
|
auto monID = monid;
|
||||||
|
|
||||||
|
@ -2635,7 +2635,7 @@ PHLWORKSPACE CCompositor::createNewWorkspace(const WORKSPACEID& id, const MONITO
|
||||||
|
|
||||||
const bool SPECIAL = id >= SPECIAL_WORKSPACE_START && id <= -2;
|
const bool SPECIAL = id >= SPECIAL_WORKSPACE_START && id <= -2;
|
||||||
|
|
||||||
const auto PWORKSPACE = m_vWorkspaces.emplace_back(CWorkspace::create(id, monID, NAME, SPECIAL, isEmtpy));
|
const auto PWORKSPACE = m_vWorkspaces.emplace_back(CWorkspace::create(id, monID, NAME, SPECIAL, isEmpty));
|
||||||
|
|
||||||
PWORKSPACE->m_fAlpha.setValueAndWarp(0);
|
PWORKSPACE->m_fAlpha.setValueAndWarp(0);
|
||||||
|
|
||||||
|
|
|
@ -165,7 +165,7 @@ class CCompositor {
|
||||||
Vector2D parseWindowVectorArgsRelative(const std::string&, const Vector2D&);
|
Vector2D parseWindowVectorArgsRelative(const std::string&, const Vector2D&);
|
||||||
void forceReportSizesToWindowsOnWorkspace(const WORKSPACEID&);
|
void forceReportSizesToWindowsOnWorkspace(const WORKSPACEID&);
|
||||||
PHLWORKSPACE createNewWorkspace(const WORKSPACEID&, const MONITORID&, const std::string& name = "",
|
PHLWORKSPACE createNewWorkspace(const WORKSPACEID&, const MONITORID&, const std::string& name = "",
|
||||||
bool isEmtpy = true); // will be deleted next frame if left empty and unfocused!
|
bool isEmpty = true); // will be deleted next frame if left empty and unfocused!
|
||||||
void renameWorkspace(const WORKSPACEID&, const std::string& name = "");
|
void renameWorkspace(const WORKSPACEID&, const std::string& name = "");
|
||||||
void setActiveMonitor(CMonitor*);
|
void setActiveMonitor(CMonitor*);
|
||||||
bool isWorkspaceSpecial(const WORKSPACEID&);
|
bool isWorkspaceSpecial(const WORKSPACEID&);
|
||||||
|
|
|
@ -5,18 +5,18 @@
|
||||||
#include <hyprutils/string/String.hpp>
|
#include <hyprutils/string/String.hpp>
|
||||||
using namespace Hyprutils::String;
|
using namespace Hyprutils::String;
|
||||||
|
|
||||||
PHLWORKSPACE CWorkspace::create(WORKSPACEID id, MONITORID monitorID, std::string name, bool special, bool isEmtpy) {
|
PHLWORKSPACE CWorkspace::create(WORKSPACEID id, MONITORID monitorID, std::string name, bool special, bool isEmpty) {
|
||||||
PHLWORKSPACE workspace = makeShared<CWorkspace>(id, monitorID, name, special, isEmtpy);
|
PHLWORKSPACE workspace = makeShared<CWorkspace>(id, monitorID, name, special, isEmpty);
|
||||||
workspace->init(workspace);
|
workspace->init(workspace);
|
||||||
return workspace;
|
return workspace;
|
||||||
}
|
}
|
||||||
|
|
||||||
CWorkspace::CWorkspace(WORKSPACEID id, MONITORID monitorID, std::string name, bool special, bool isEmtpy) {
|
CWorkspace::CWorkspace(WORKSPACEID id, MONITORID monitorID, std::string name, bool special, bool isEmpty) {
|
||||||
m_iMonitorID = monitorID;
|
m_iMonitorID = monitorID;
|
||||||
m_iID = id;
|
m_iID = id;
|
||||||
m_szName = name;
|
m_szName = name;
|
||||||
m_bIsSpecialWorkspace = special;
|
m_bIsSpecialWorkspace = special;
|
||||||
m_bWasCreatedEmtpy = isEmtpy;
|
m_bWasCreatedEmpty = isEmpty;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CWorkspace::init(PHLWORKSPACE self) {
|
void CWorkspace::init(PHLWORKSPACE self) {
|
||||||
|
@ -49,7 +49,7 @@ void CWorkspace::init(PHLWORKSPACE self) {
|
||||||
const auto WORKSPACERULE = g_pConfigManager->getWorkspaceRuleFor(self);
|
const auto WORKSPACERULE = g_pConfigManager->getWorkspaceRuleFor(self);
|
||||||
m_bPersistent = WORKSPACERULE.isPersistent;
|
m_bPersistent = WORKSPACERULE.isPersistent;
|
||||||
|
|
||||||
if (self->m_bWasCreatedEmtpy)
|
if (self->m_bWasCreatedEmpty)
|
||||||
if (auto cmd = WORKSPACERULE.onCreatedEmptyRunCmd)
|
if (auto cmd = WORKSPACERULE.onCreatedEmptyRunCmd)
|
||||||
g_pKeybindManager->spawn(*cmd);
|
g_pKeybindManager->spawn(*cmd);
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@ class CWindow;
|
||||||
|
|
||||||
class CWorkspace {
|
class CWorkspace {
|
||||||
public:
|
public:
|
||||||
static PHLWORKSPACE create(WORKSPACEID id, MONITORID monitorID, std::string name, bool special = false, bool isEmtpy = true);
|
static PHLWORKSPACE create(WORKSPACEID id, MONITORID monitorID, std::string name, bool special = false, bool isEmpty = true);
|
||||||
// use create() don't use this
|
// use create() don't use this
|
||||||
CWorkspace(WORKSPACEID id, MONITORID monitorID, std::string name, bool special = false, bool isEmpty = true);
|
CWorkspace(WORKSPACEID id, MONITORID monitorID, std::string name, bool special = false, bool isEmpty = true);
|
||||||
~CWorkspace();
|
~CWorkspace();
|
||||||
|
@ -57,7 +57,7 @@ class CWorkspace {
|
||||||
// last monitor (used on reconnect)
|
// last monitor (used on reconnect)
|
||||||
std::string m_szLastMonitor = "";
|
std::string m_szLastMonitor = "";
|
||||||
|
|
||||||
bool m_bWasCreatedEmtpy = true;
|
bool m_bWasCreatedEmpty = true;
|
||||||
|
|
||||||
bool m_bPersistent = false;
|
bool m_bPersistent = false;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue