mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-27 14:29:21 +00:00
Compare commits
3 Commits
629a692ce2
...
391ed04cd2
Author | SHA1 | Date | |
---|---|---|---|
|
391ed04cd2 | ||
|
bdaf1dbe99 | ||
|
8e29ad433d |
@ -390,7 +390,7 @@ DMGNAME="${LyxBase}${LyXGitCommitHash:+-}${LyXGitCommitHash}"
|
|||||||
DMGSIZE="550m"
|
DMGSIZE="550m"
|
||||||
|
|
||||||
# Check for existing SDKs
|
# Check for existing SDKs
|
||||||
SDKs=$(echo ${DEVELOPER_SDKS}/MacOSX1[01]*sdk)
|
SDKs=$(echo ${DEVELOPER_SDKS}/MacOSX1[0-9]*sdk)
|
||||||
case $SDKs in
|
case $SDKs in
|
||||||
*${SDKROOT}*)
|
*${SDKROOT}*)
|
||||||
;;
|
;;
|
||||||
|
@ -2286,9 +2286,7 @@ bool Cursor::upDownInText(bool up)
|
|||||||
}
|
}
|
||||||
|
|
||||||
Row const & real_next_row = tm.parMetrics(pit()).rows()[next_row];
|
Row const & real_next_row = tm.parMetrics(pit()).rows()[next_row];
|
||||||
auto [b, p] = tm.getPosNearX(real_next_row, xo);
|
tie(pos(), boundary()) = tm.getPosNearX(real_next_row, xo);
|
||||||
pos() = p;
|
|
||||||
boundary(b);
|
|
||||||
// When selection==false, this is done by TextMetrics::editXY
|
// When selection==false, this is done by TextMetrics::editXY
|
||||||
setCurrentFont();
|
setCurrentFont();
|
||||||
|
|
||||||
|
@ -129,6 +129,8 @@ public:
|
|||||||
///
|
///
|
||||||
bool boundary() const { return boundary_; }
|
bool boundary() const { return boundary_; }
|
||||||
///
|
///
|
||||||
|
bool & boundary() { return boundary_; }
|
||||||
|
///
|
||||||
void boundary(bool b) { boundary_ = b; }
|
void boundary(bool b) { boundary_ = b; }
|
||||||
|
|
||||||
// the two methods below have been inlined out because of
|
// the two methods below have been inlined out because of
|
||||||
|
@ -1797,8 +1797,9 @@ bool GuiView::event(QEvent * e)
|
|||||||
// We need to update metrics here to avoid a crash (#12786)
|
// We need to update metrics here to avoid a crash (#12786)
|
||||||
theBufferList().changed(true);
|
theBufferList().changed(true);
|
||||||
refillToolbars();
|
refillToolbars();
|
||||||
|
return QMainWindow::event(e);
|
||||||
}
|
}
|
||||||
return QMainWindow::event(e);
|
return true;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
// Pre 6.8: OS-dependent
|
// Pre 6.8: OS-dependent
|
||||||
|
Loading…
Reference in New Issue
Block a user